summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-04-22 17:26:31 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-04-23 11:58:00 +0200
commitdb1cf111666847ce5ce93d18ae5ae8c29a4c44d6 (patch)
tree56af2730e4ecb6c907c796dc196e767904150449 /sw/source/uibase
parent983c1146ac80c038feae653e8e3752a72171d6cb (diff)
undo blocking emitting focus events during grab_focus
revert... commit f97dbac73fe149e8fed0932890d0c1d6be4869a3 Author: Caolán McNamara <caolanm@redhat.com> Date: Wed Jun 26 21:00:02 2019 +0100 infinite focus changing in toc biblio page which blocked calling focus-changed callbacks when grab_focus is called explicitly analogous to how we block value-changed callbacks setting values through code but don't block them when the value is changed by user interaction. In retrospect that was a poor choice, so revert that and subsequent workarounds in favour of just not calling gtk_grab_focus if the widget already has focus. checked: a) tdf#138427 focus set to wrong input box b) tdf#138078 only call GetFocus if we gained focus from an unfocused state c) tdf#137993 ensure the toplevel vcl::Window is activated d) tdf#136941 call focus in handler explicitly Change-Id: I411480e2d627aa9995fb41b0aa17e9fb6d34d73f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114524 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/inc/conttree.hxx2
1 files changed, 0 insertions, 2 deletions
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 496a7f602858..f572bc76a983 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -252,7 +252,6 @@ public:
void grab_focus()
{
m_xTreeView->grab_focus();
- FocusInHdl(*m_xTreeView);
}
void set_selection_mode(SelectionMode eMode)
@@ -338,7 +337,6 @@ public:
void grab_focus()
{
m_xTreeView->grab_focus();
- FocusInHdl(*m_xTreeView);
}
void set_selection_mode(SelectionMode eMode)