1127700 - Detect wheel zoom via WheelPrefs instead of Ctrl modifier

Status: RESOLVED FIXED

(Core :: Panning and Zooming, defect)

Description

[David Anderson [:dvander] - inactive, e-mail if emergency]

Attachment: zoom.patch

Comment 1

[Olli Pettay [:smaug][[e-mail]]]

Comment on attachment 8556892 [details] [diff] [review]
zoom.patch



>index 43fb236..41dd32e 100644
>--- a/dom/events/EventStateManager.h
>+++ b/dom/events/EventStateManager.h
>@@ -219,16 +219,19 @@ public:
> 
>   // Sets the full-screen event state on aElement to aIsFullScreen.
>   static void SetFullScreenState(dom::Element* aElement, bool aIsFullScreen);
> 
>   static bool IsRemoteTarget(nsIContent* aTarget);
>   static LayoutDeviceIntPoint GetChildProcessOffset(nsFrameLoader* aFrameLoader,
>                                                     const WidgetEvent& aEvent);
> 
>+  // Returns true if the given WidgetWheelEvent will resolve to a scroll event.
s/scroll event/scroll action/


>       WidgetWheelEvent& wheelEvent = *aEvent.AsWheelEvent();
>-      if (wheelEvent.IsControl() ||
>-          wheelEvent.deltaMode != nsIDOMWheelEvent::DOM_DELTA_LINE)
>+      if (wheelEvent.deltaMode != nsIDOMWheelEvent::DOM_DELTA_LINE ||
>+          !EventStateManager::WheelEventIsScrollAction(&wheelEvent))

Not about this bug, but it isn't clear to me why we have wheelEvent.deltaMode != nsIDOMWheelEvent::DOM_DELTA_LINE.

Comment 2

[David Anderson [:dvander] - inactive, e-mail if emergency]

remote:   https://hg.mozilla.org/integration/mozilla-inbound/rev/36f837f3ce68

The DOM_DELTA_LINE is just because APZ doesn't yet support pixel or page scrolling, neither seemed to be very common when invoked from the scroll wheel.

Comment 3

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/36f837f3ce68