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

Caolán McNamara caolanm at redhat.com
Thu Mar 12 02:33:11 PDT 2015


 vcl/unx/gtk/window/gtksalframe.cxx |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 73c347efb30c87b9480699f6cbbbaf5c896c4a22
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 12 09:29:08 2015 +0000

    gtk3 is sendine me duplicate mouse downs/ups unless I return true
    
    with gtk3-3.14.9, while gtk3-3.10.9 doesn't
    
    Change-Id: I3b383ae2123137b3376e97415de33f7a71eeaa57

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index afcdbe5..956ae93 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -3251,7 +3251,7 @@ gboolean GtkSalFrame::signalButton( GtkWidget*, GdkEventButton* pEvent, gpointer
         }
     }
 
-    return false;
+    return true;
 }
 
 gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame )
@@ -3262,7 +3262,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
 #if GTK_CHECK_VERSION(3,0,0)
     //TODO: do something less feeble here
     if (pSEvent->direction == GDK_SCROLL_SMOOTH)
-        return false;
+        return true;
 #endif
 
     static sal_uLong        nLines = 0;
@@ -3291,7 +3291,7 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
 
     pThis->CallCallback( SALEVENT_WHEELMOUSE, &aEvent );
 
-    return false;
+    return true;
 }
 
 gboolean GtkSalFrame::signalMotion( GtkWidget*, GdkEventMotion* pEvent, gpointer frame )
@@ -3855,8 +3855,7 @@ gboolean GtkSalFrame::signalVisibility( GtkWidget*, GdkEventVisibility* pEvent,
 {
     GtkSalFrame* pThis = (GtkSalFrame*)frame;
     pThis->m_nVisibility = pEvent->state;
-
-    return false;
+    return true;
 }
 
 void GtkSalFrame::signalDestroy( GtkWidget* pObj, gpointer frame )


More information about the Libreoffice-commits mailing list