diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-03-26 15:59:40 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-27 09:57:48 +0100 |
| commit | f1e52cbdd4a9753a9b9d562ef280a00e52db1dae (patch) | |
| tree | d495dabf422167c9d93c8b3914ac62437c51ef2d /svx | |
| parent | 223eac2d666263b127a7e774fd74352581a9209f (diff) | |
Resolves: tdf#123291 set hex input to overwrite by default
and ensure the modify arrives after the input text has been
filtered
Change-Id: I16c0bd095700e7d9858e3e74884b5a1ad3eb7e4c
Reviewed-on: https://gerrit.libreoffice.org/69764
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/hexcolorcontrol.cxx | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/svx/source/dialog/hexcolorcontrol.cxx b/svx/source/dialog/hexcolorcontrol.cxx index e9ddfb553a43..70e32e540827 100644 --- a/svx/source/dialog/hexcolorcontrol.cxx +++ b/svx/source/dialog/hexcolorcontrol.cxx @@ -19,22 +19,49 @@ #include <svx/hexcolorcontrol.hxx> #include <rtl/character.hxx> +#include <vcl/svapp.hxx> namespace weld { HexColorControl::HexColorControl(std::unique_ptr<weld::Entry> pEntry) : m_xEntry(std::move(pEntry)) + , m_nAsyncModifyEvent(nullptr) { m_xEntry->set_max_length(6); m_xEntry->set_width_chars(6); m_xEntry->connect_insert_text(LINK(this, HexColorControl, ImplProcessInputHdl)); + m_xEntry->connect_changed(LINK(this, HexColorControl, ImplProcessModifyHdl)); +} + +HexColorControl::~HexColorControl() +{ + if (m_nAsyncModifyEvent) + Application::RemoveUserEvent(m_nAsyncModifyEvent); +} + +IMPL_LINK_NOARG(HexColorControl, OnAsyncModifyHdl, void*, void) +{ + m_nAsyncModifyEvent = nullptr; + m_aModifyHdl.Call(*m_xEntry); +} + +// tdf#123291 resend it async so it arrives after ImplProcessInputHdl has been +// processed +IMPL_LINK_NOARG(HexColorControl, ImplProcessModifyHdl, weld::Entry&, void) +{ + if (m_nAsyncModifyEvent) + Application::RemoveUserEvent(m_nAsyncModifyEvent); + m_nAsyncModifyEvent = Application::PostUserEvent(LINK(this, HexColorControl, OnAsyncModifyHdl)); } void HexColorControl::SetColor(Color nColor) { OUStringBuffer aBuffer; sax::Converter::convertColor(aBuffer, nColor); - m_xEntry->set_text(aBuffer.makeStringAndClear().copy(1)); + OUString sColor = aBuffer.makeStringAndClear().copy(1); + if (sColor == m_xEntry->get_text()) + return; + m_xEntry->set_text(sColor); } Color HexColorControl::GetColor() |