Kaydet (Commit) 07032e5a authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
4e7495ac 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
üst aec7399c
......@@ -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() )
......
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment