[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - vcl/unx

[Maxim Monastirsky]

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

New commits:
commit f1b786bdd2576f584c62bfa797d3849eb5330c2c
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Wed Dec 28 01:02:33 2016 +0200

    tdf#104944 gtk3: Ignore mouse up event if the wrong frame
    
    Change-Id: I3d0aad6d2b434866df9110d3b8493fec2d2c94fe
    Reviewed-on: https://gerrit.libreoffice.org/32465
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>
    (cherry picked from commit 23a13694a5a70098b5ecd58b99d99618111f3ea5)

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index ab10260..56a74ac 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2610,11 +2610,12 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
 
     vcl::DeletionListener aDel( pThis );
 
-    if (pEvent->type == GDK_BUTTON_PRESS && pThis->isFloatGrabWindow())
+    if (pThis->isFloatGrabWindow() && pEvent->window != widget_get_window(pThis->getMouseEventWidget()))
     {
-        bool bClosePopups = (pEvent->window != widget_get_window(pThis->getMouseEventWidget()));
-        if (bClosePopups)
+        if (pEvent->type == GDK_BUTTON_PRESS)
             pThis->closePopup();
+        else if (pEvent->type == GDK_BUTTON_RELEASE)
+            return true;
     }
 
     if (!aDel.isDeleted())