diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-27 14:58:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-28 13:31:44 +0100 |
| commit | 794d5a3bb225bbfaced4dd968734783f073ba70b (patch) | |
| tree | 3cf7e9224e3bc8b0345bfc44e5958e45c4186f61 /include | |
| parent | 270d134752568158ddad9cd8c783879203684a06 (diff) | |
don't put focus into unmapped windows
defer until the color selectors are activated to grab focus, otherwise
esc doesn't work to close a dialog under gtk3 until focus is put
into some visible widget
Change-Id: I297c2738c4103024bbefd70bbcb5d72b8429dd3e
Reviewed-on: https://gerrit.libreoffice.org/83917
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit e55a1dc163165cb79fc9113101d16ee8d3db7298)
Reviewed-on: https://gerrit.libreoffice.org/83966
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/ctrlbox.hxx | 1 | ||||
| -rw-r--r-- | include/svx/colorbox.hxx | 3 | ||||
| -rw-r--r-- | include/svx/colorwindow.hxx | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 1805778aa3d2..a02484d005aa 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -255,6 +255,7 @@ private: DECL_LINK(StyleUpdated, weld::Widget&, void); DECL_LINK(ValueSelectHdl, SvtValueSet*, void); DECL_LINK(FocusHdl, weld::Widget&, void); + DECL_LINK(ToggleHdl, weld::ToggleButton&, void); DECL_LINK(NoneHdl, weld::Button&, void); void UpdateEntries(); diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index 16d5fa1be3d2..373b8cf11403 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -103,6 +103,9 @@ private: void createColorWindow(); void LockWidthRequest(); ColorWindow* getColorWindow() const; + + DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + public: ColorListBox(std::unique_ptr<weld::MenuButton> pControl, weld::Window* pWindow); ~ColorListBox(); diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index c3863f80ee80..965727d0a536 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -155,7 +155,6 @@ private: DECL_LINK(SelectPaletteHdl, weld::ComboBox&, void); DECL_LINK(AutoColorClickHdl, weld::Button&, void); DECL_LINK(OpenPickerClickHdl, weld::Button&, void); - DECL_LINK(FocusHdl, weld::Widget&, void); static bool SelectValueSetEntry(ColorValueSet* pColorSet, const Color& rColor); static NamedColor GetSelectEntryColor(SvtValueSet const * pColorSet); @@ -177,6 +176,8 @@ public: void SelectEntry(const Color& rColor); NamedColor GetSelectEntryColor() const; + DECL_LINK(FocusHdl, weld::Widget&, void); + virtual void statusChanged( const css::frame::FeatureStateEvent& rEvent ) override; }; |