Changeset 70479 in webkit

Timestamp:

Oct 25, 2010 12:49:43 PM (14 years ago)

Author:

bweinstein@apple.com

Message:

Control + Mousewheel shouldn't be handled in WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=48253

Reviewed by Adam Roben.

Don't handle a wheel event if Control is pressed, pass the message back to DefWindowProc.

• UIProcess/win/WebView.cpp:

(WebKit::WebView::onWheelEvent):

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/win/WebView.cpp (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-25  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Control + Mousewheel shouldn't be handled in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=48253
+        
+        Don't handle a wheel event if Control is pressed, pass the message back to DefWindowProc.
+
+        * UIProcess/win/WebView.cpp:
+        (WebKit::WebView::onWheelEvent):
+
 2010-10-25  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/UIProcess/win/WebView.cpp

@@ -315 +315 @@
 LRESULT WebView::onWheelEvent(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam, bool& handled)
 {
-    // Ctrl+Mouse wheel doesn't ever go into WebCore.  It is used to
-    // zoom instead (Mac zooms the whole Desktop, but Windows browsers trigger their
-    // own local zoom modes for Ctrl+wheel).
-    /*
-    if (wParam & MK_CONTROL) {
-        short delta = static_cast<short>(HIWORD(wParam));
-        if (delta < 0)
-            m_page->makeTextSmaller(0);
-        else
-            m_page->makeTextLarger(0);
-
-        handled = true;
+    WebWheelEvent wheelEvent = WebEventFactory::createWebWheelEvent(hWnd, message, wParam, lParam);
+    if (wheelEvent.controlKey()) {
+        // We do not want WebKit to handle Control + Wheel, this should be handled by the client application
+        // to zoom the page.
+        handled = false;
         return 0;
     }
-    */
-
-    WebWheelEvent wheelEvent = WebEventFactory::createWebWheelEvent(hWnd, message, wParam, lParam);
+
     m_page->handleWheelEvent(wheelEvent);