|
 |
f325b2 |
From 14e7252cc4ceaf1a732034696a17dd3ad1439902 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
f325b2 |
Date: Wed, 27 Jan 2016 16:20:35 +0000
|
|
|
f325b2 |
Subject: [PATCH] Resolves: rhbz#1294208 trackpad two finger scroll does into
|
|
|
f325b2 |
reverse
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: Ic576f14cae82781a93e52972513a28c4a141d1a2
|
|
|
f325b2 |
(cherry picked from commit e734c7f53cfffa6141e6b46c06825ee273e2136b)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
vcl/unx/gtk3/gtk3gtkframe.cxx | 8 +++-----
|
|
|
f325b2 |
1 file changed, 3 insertions(+), 5 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
f325b2 |
index af284ca..3914de5 100644
|
|
|
f325b2 |
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
f325b2 |
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
|
|
|
f325b2 |
@@ -2557,14 +2557,12 @@ gboolean GtkSalFrame::signalScroll( GtkWidget*, GdkEvent* pEvent, gpointer frame
|
|
|
f325b2 |
{
|
|
|
f325b2 |
case GDK_SCROLL_SMOOTH:
|
|
|
f325b2 |
{
|
|
|
f325b2 |
- double delta_x, delta_y;
|
|
|
f325b2 |
- gdk_event_get_scroll_deltas(pEvent, &delta_x, &delta_y);
|
|
|
f325b2 |
//pick the bigger one I guess
|
|
|
f325b2 |
- aEvent.mbHorz = fabs(delta_x) > fabs(delta_y);
|
|
|
f325b2 |
+ aEvent.mbHorz = fabs(pSEvent->delta_x) > fabs(pSEvent->delta_y);
|
|
|
f325b2 |
if (aEvent.mbHorz)
|
|
|
f325b2 |
- aEvent.mnDelta = -delta_x;
|
|
|
f325b2 |
+ aEvent.mnDelta = -pSEvent->delta_x * 40;
|
|
|
f325b2 |
else
|
|
|
f325b2 |
- aEvent.mnDelta = -delta_y;
|
|
|
f325b2 |
+ aEvent.mnDelta = -pSEvent->delta_y * 40;
|
|
|
f325b2 |
aEvent.mnScrollLines = 1;
|
|
|
f325b2 |
pThis->m_nLastScrollEventTime = pSEvent->time;
|
|
|
f325b2 |
break;
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.5.0
|
|
|
f325b2 |
|