diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-04 09:53:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-04 12:50:59 +0100 |
| commit | 02c5a61944a212ecc4573001a2fb853339448b03 (patch) | |
| tree | c62398716c2df60ca6730d1ce9c203b32732bd16 /vcl | |
| parent | 35e43ce1b1f32acab5bba15425fa86fa0edd6c52 (diff) | |
tdf#129634 ignore floating toolbars
Change-Id: Id51f14f75e6547532d9742ef3420e10d06974a17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87957
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 6096dbd09ba0..ce2ed4f3ab47 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -3058,6 +3058,10 @@ void GtkSalFrame::signalSetFocus(GtkWindow*, GtkWidget* pWidget, gpointer frame) return; // change of focus between native widgets within the toplevel GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); + // tdf#129634 ignore floating toolbars + if (pThis->m_nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION) + return; + // tdf#129634 interpret losing focus as focus passing explicitly to another widget bool bLoseFocus = pWidget && pWidget != GTK_WIDGET(pThis->m_pFixedContainer); pThis->CallCallbackExc(bLoseFocus ? SalEvent::LoseFocus : SalEvent::GetFocus, nullptr); |