vcl/aqua/source/window/salframeview.mm | 2 +- vcl/inc/salwtype.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 07032e5a6ef2fa42229e8bbf5219935beefa2447 Author: Tor Lillqvist <[email protected]> Date: Sun Nov 10 14:33:01 2013 +0200 fdo#71321: We should not actually use the delta-is-pixels concept on OS X Despite the comment in salwtype.hxx, and despite it being set, before 4e7495ac2cb6b015ad492def45fd24f4ba0f54f8 the mbDeltaIsPixel flag had not been used for anything on OS X (or other desktop OSes). So when the code was modified for the sake of touch devices to do take mbDeltaIsPixel into consideration, that code path was incorrectly taken also on OS X leading to incorrect scrolling. Change-Id: I7cbca4656037eefce963e976f6acf8fbb32d5269 diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 2931aaf..31b87e2 100644 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -880,7 +880,7 @@ private: aEvent.mnX = static_cast<long>(aPt.x) - mpFrame->maGeometry.nX; aEvent.mnY = static_cast<long>(aPt.y) - mpFrame->maGeometry.nY; aEvent.mnCode = ImplGetModifierMask( mpFrame->mnLastModifierFlags ); - aEvent.mbDeltaIsPixel = TRUE; + aEvent.mbDeltaIsPixel = FALSE; // --- RTL --- (mirror mouse pos) if( Application::GetSettings().GetLayoutRTL() ) diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 135cd5d..de9e2a4 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -156,7 +156,7 @@ struct SalWheelMouseEvent sal_uLong mnScrollLines; // Actual number of lines to scroll sal_uInt16 mnCode; // SV-Modifiercode (KEY_SHIFT|KEY_MOD1|KEY_MOD2|MOUSE_LEFT|MOUSE_MIDDLE|MOUSE_RIGHT) sal_Bool mbHorz; // Horizontal - sal_Bool mbDeltaIsPixel; // delta value is a pixel value (on mac) + sal_Bool mbDeltaIsPixel; // delta value is a pixel value (on touch devices) SalWheelMouseEvent() : mnTime( 0 ), mnX( 0 ), mnY( 0 ), mnDelta( 0 ), mnNotchDelta( 0 ), mnScrollLines( 0 ), mnCode( 0 ), mbHorz( sal_False ), mbDeltaIsPixel( sal_False ) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
