[Libreoffice-commits] core.git: vcl/unx

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 10367c3a583e962dbb0df5b81846f702f4180097
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jun 10 21:22:04 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 11 10:03:45 2020 +0200

    don't need to treat floating toolbars differently for set-focus
    
    We don't seem to need this anymore, probably
    
    commit ea1182c8c2c42c0c527e232f7e392196796940d7
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Wed Jun 10 12:16:17 2020 +0100
    
        grab focus to style combobox when parent gets focus
    
    was the right fix
    
    Change-Id: If5d966bfb3fcb47ba09f81b1e786df76a7561bf0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96071
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index d372391fec2a..a8d33f80fbc2 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -3093,10 +3093,6 @@ 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);