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

[Caolán McNamara]

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

New commits:
commit e734c7f53cfffa6141e6b46c06825ee273e2136b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 27 16:20:35 2016 +0000

    Resolves: rhbz#1294208 trackpad two finger scroll does into reverse
    
    Change-Id: Ic576f14cae82781a93e52972513a28c4a141d1a2

diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index de86fbc..c7d2a40 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -2560,14 +2560,12 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
     {
         case GDK_SCROLL_SMOOTH:
         {
-            double delta_x, delta_y;
-            gdk_event_get_scroll_deltas(pEvent, &delta_x, &delta_y);
             //pick the bigger one I guess
-            aEvent.mbHorz = fabs(delta_x) > fabs(delta_y);
+            aEvent.mbHorz = fabs(pSEvent->delta_x) > fabs(pSEvent->delta_y);
             if (aEvent.mbHorz)
-                aEvent.mnDelta = -delta_x;
+                aEvent.mnDelta = -pSEvent->delta_x * 40;
             else
-                aEvent.mnDelta = -delta_y;
+                aEvent.mnDelta = -pSEvent->delta_y * 40;
             aEvent.mnScrollLines = 1;
             pThis->m_nLastScrollEventTime = pSEvent->time;
             break;