From 378d7d68d9e842039bcf797a8b95c2e85768e1e7 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 20 Jan 2018 20:01:13 +0000 Subject: tdf#109062 restore osx scrollwheel logic 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 Reviewed-by: Eike Rathke --- vcl/osx/salframeview.mm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm index 50cd5bc4e722..c7bf9c965d87 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -807,9 +807,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 ); } } @@ -929,9 +930,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 ); } @@ -942,9 +944,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 ); } -- cgit v1.2.3