diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-08-23 20:12:28 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-08-24 12:12:15 +0200 |
| commit | 6a4dfa7469168207a9c11463d1b1c9cef5f86c3f (patch) | |
| tree | 3a97034fd978e7acd5377940b7abbd62a1be41a0 /vcl/unx | |
| parent | 3e4510c06d7561b5b72146b999c8053cba3917bc (diff) | |
tdf#135779 move focus back to usual parent before grabbing pointer
Change-Id: Ia4f1f2f1672a76515ab586d679a05467515868d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101153
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index c5e475fb1555..5d773bbeeb8a 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1990,6 +1990,13 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle ) void GtkSalFrame::grabPointer( bool bGrab, bool bKeyboardAlso, bool bOwnerEvents ) { + if (bGrab) + { + // tdf#135779 move focus back inside usual input window out of any + // other gtk widgets before grabbing the pointer + GrabFocus(); + } + static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" ); if (pEnv && *pEnv) return; @@ -2526,8 +2533,10 @@ void GtkSalFrame::GrabFocus() pGrabWidget = GTK_WIDGET(m_pWindow); else pGrabWidget = GTK_WIDGET(m_pFixedContainer); - gtk_widget_set_can_focus(pGrabWidget, true); - gtk_widget_grab_focus(pGrabWidget); + if (!gtk_widget_get_can_focus(pGrabWidget)) + gtk_widget_set_can_focus(pGrabWidget, true); + if (!gtk_widget_has_focus(pGrabWidget)) + gtk_widget_grab_focus(pGrabWidget); } gboolean GtkSalFrame::signalButton(GtkWidget*, GdkEventButton* pEvent, gpointer frame) |