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

[Caolán McNamara (via logerrit)]

 vcl/unx/gtk3/gtk3gtkframe.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7ccfba06efaa28423accaeab9cd248fa0093f737
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 11 12:32:23 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jun 11 18:21:12 2020 +0200

    restore parent grab mode instead of assuming it should be false
    
    Change-Id: If20de104a058ef3bb5642cb4ecdb7c5c6f931efe
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96126
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index a8d33f80fbc2..5f2ec2a152b2 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1356,7 +1356,8 @@ void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ )
                     removeGrabLevel();
                     grabPointer(false, true, false);
                     m_pParent->removeGrabLevel();
-                    m_pParent->grabPointer(false, true, false);
+                    bool bParentIsFloatGrabWindow = m_pParent->isFloatGrabWindow();
+                    m_pParent->grabPointer(bParentIsFloatGrabWindow, true, bParentIsFloatGrabWindow);
                 }
             }
             gtk_widget_hide( m_pWindow );