From 5337274e15b59ea96268d5a86f10e364a36a8200 Mon Sep 17 00:00:00 2001 From: Cameron Kaiser Date: Tue, 3 Jul 2018 22:01:07 -0700 Subject: [PATCH] tune up scroll wheel events while we're at it --- widget/cocoa/nsChildView.mm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 3747f0873..025abd421 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -6029,12 +6029,19 @@ PanGestureTypeForEvent(NSEvent* aEvent) { [self convertCocoaMouseEvent:aMouseEvent toGeckoEvent:outWheelEvent]; +#ifdef __LP64__ bool usePreciseDeltas = nsCocoaUtils::HasPreciseScrollingDeltas(aMouseEvent) && Preferences::GetBool("mousewheel.enable_pixel_scrolling", true); outWheelEvent->deltaMode = usePreciseDeltas ? nsIDOMWheelEvent::DOM_DELTA_PIXEL : nsIDOMWheelEvent::DOM_DELTA_LINE; outWheelEvent->isMomentum = nsCocoaUtils::IsMomentumScrollEvent(aMouseEvent); +#else + // Pixel scrolling and phases/momentum aren't supported until 10.7. + // We don't support 10.7, so let's save some overhead. + outWheelEvent->deltaMode = nsIDOMWheelEvent::DOM_DELTA_LINE; + outWheelEvent->isMomentum = false; +#endif } - (void) convertCocoaMouseEvent:(NSEvent*)aMouseEvent