diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-01-20 20:01:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-01-22 11:30:30 +0100 |
| commit | bf92a5af6cb2928578bade9d367738d7e0f283e7 (patch) | |
| tree | a988b6dd4b39a01d697059f1ff18af66c79ef4fd | |
| parent | iOS, performance update (diff) | |
| download | core-bf92a5af6cb2928578bade9d367738d7e0f283e7.tar.gz core-bf92a5af6cb2928578bade9d367738d7e0f283e7.zip | |
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/48249
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -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 a12655c4b019..e1d85a4fd64f 100644 --- a/vcl/osx/salframeview.mm +++ b/vcl/osx/salframeview.mm @@ -820,9 +820,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 ); } } @@ -942,9 +943,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 ); } @@ -955,9 +957,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 ); } |