diff options
Diffstat (limited to 'WebCore/platform/mac/WheelEventMac.mm')
| -rw-r--r-- | WebCore/platform/mac/WheelEventMac.mm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/WebCore/platform/mac/WheelEventMac.mm b/WebCore/platform/mac/WheelEventMac.mm index 558bc5f..7b60494 100644 --- a/WebCore/platform/mac/WheelEventMac.mm +++ b/WebCore/platform/mac/WheelEventMac.mm @@ -34,8 +34,6 @@ namespace WebCore { PlatformWheelEvent::PlatformWheelEvent(NSEvent* event) : m_position(pointForEvent(event)) , m_globalPosition(globalPointForEvent(event)) - , m_deltaX([event deltaX]) - , m_deltaY([event deltaY]) , m_isAccepted(false) , m_shiftKey([event modifierFlags] & NSShiftKeyMask) , m_ctrlKey([event modifierFlags] & NSControlKeyMask) @@ -43,8 +41,12 @@ PlatformWheelEvent::PlatformWheelEvent(NSEvent* event) , m_metaKey([event modifierFlags] & NSCommandKeyMask) { BOOL continuous; - wkGetWheelEventDeltas(event, &m_continuousDeltaX, &m_continuousDeltaY, &continuous); - m_isContinuous = continuous; + wkGetWheelEventDeltas(event, &m_deltaX, &m_deltaY, &continuous); + m_granularity = continuous ? ScrollByPixelWheelEvent : ScrollByLineWheelEvent; + if (m_granularity == ScrollByLineWheelEvent) { + m_deltaX *= horizontalLineMultiplier(); + m_deltaY *= verticalLineMultiplier(); + } } } // namespace WebCore |