diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-01-20 20:01:13 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-02-06 15:27:39 +0100 |
commit | f25e67d64b9e90ff2725ca29fc7445e9c63e0b2a (patch) | |
tree | 6a056d0e1bb5a9c3661d2eb747f573cd0dcff9c0 | |
parent | 64f60cacd6b8ac0b091f1207e806887dc44def19 (diff) |
tdf#109062 restore osx scrollwheel logicco-5.3-39
to pre
commit f7d2bf216afa10268e6a7c1d4613a2fd8f7c7f3c
Date: Tue May 16 10:12:09 2017 +0100
Resolves: tdf#103174 & rhbz#1367846 improve gtk3 trackpad scrolling
state.
Change-Id: If5a494441731e73136158b4905c2744ba8bc8875
Reviewed-on: https://gerrit.libreoffice.org/48306
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 378d7d68d9e842039bcf797a8b95c2e85768e1e7)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 7a5a04ca9f7a32659774362e225dd6f0bd8840ed)
-rw-r--r-- | vcl/osx/salframeview.mm | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 1b16485edcff..91f8e06118a2 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -809,9 +809,10 @@ private: if( aEvent.mnDelta == 0 ) aEvent.mnDelta = aEvent.mnNotchDelta; aEvent.mbHorz = FALSE; - aEvent.mnScrollLines = nDeltaZ; - if( aEvent.mnScrollLines == 0 ) - aEvent.mnScrollLines = 1; + sal_uInt32 nScrollLines = nDeltaZ; + if (nScrollLines == 0) + nScrollLines = 1; + aEvent.mnScrollLines = nScrollLines; mpFrame->CallCallback( SalEvent::WheelMouse, &aEvent ); } } @@ -933,9 +934,10 @@ SAL_WNODEPRECATED_DECLARATIONS_POP if( aEvent.mnDelta == 0 ) aEvent.mnDelta = aEvent.mnNotchDelta; aEvent.mbHorz = TRUE; - aEvent.mnScrollLines = fabs(dX) / WHEEL_EVENT_FACTOR; - if( aEvent.mnScrollLines == 0 ) - aEvent.mnScrollLines = 1; + sal_uInt32 nScrollLines = fabs(dX) / WHEEL_EVENT_FACTOR; + if (nScrollLines == 0) + nScrollLines = 1; + aEvent.mnScrollLines = nScrollLines; mpFrame->CallCallback( SalEvent::WheelMouse, &aEvent ); } @@ -946,9 +948,10 @@ SAL_WNODEPRECATED_DECLARATIONS_POP if( aEvent.mnDelta == 0 ) aEvent.mnDelta = aEvent.mnNotchDelta; aEvent.mbHorz = FALSE; - aEvent.mnScrollLines = fabs(dY) / WHEEL_EVENT_FACTOR; - if( aEvent.mnScrollLines == 0 ) - aEvent.mnScrollLines = 1; + sal_uInt32 nScrollLines = fabs(dY) / WHEEL_EVENT_FACTOR; + if (nScrollLines == 0) + nScrollLines = 1; + aEvent.mnScrollLines = nScrollLines; mpFrame->CallCallback( SalEvent::WheelMouse, &aEvent ); } |