From db1cf111666847ce5ce93d18ae5ae8c29a4c44d6 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 22 Apr 2021 17:26:31 +0100 Subject: undo blocking emitting focus events during grab_focus MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit revert... commit f97dbac73fe149e8fed0932890d0c1d6be4869a3 Author: Caolán McNamara 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 --- sc/source/ui/app/inputwin.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'sc') diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 67c12839a4ac..8e0fdc7ce584 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2127,6 +2127,7 @@ void ScTextWnd::StyleUpdated() void ScTextWnd::TextGrabFocus() { GrabFocus(); + GetFocus(); } // Position window -- cgit