Commit ee4fefeb authored by bweinstein@apple.com's avatar bweinstein@apple.com
Browse files

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):



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70479 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent c17f794d
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>
 
Reviewed by Dan Bernstein.
......
......@@ -314,23 +314,14 @@ LRESULT WebView::onMouseEvent(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
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);
handled = true;
......
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