Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1932)

Unified Diff: Source/platform/scroll/ScrollAnimator.cpp

Issue 212913002: Prevent ctrl+wheel from scrolling in more places (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/scroll/ScrollAnimator.cpp
diff --git a/Source/platform/scroll/ScrollAnimator.cpp b/Source/platform/scroll/ScrollAnimator.cpp
index 412c592362a9d5b9f78c62ab4c674b1767f7d1fa..c7d98d7711b8c26a8a95c8f1f04e7d7441731cc4 100644
--- a/Source/platform/scroll/ScrollAnimator.cpp
+++ b/Source/platform/scroll/ScrollAnimator.cpp
@@ -76,6 +76,10 @@ void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
bool ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e)
{
+ // ctrl+wheel events are used to trigger zooming, not scrolling.
rjkroege 2014/03/26 20:03:25 i am not convinced that this is the right place to
+ if (e.modifiers() & PlatformEvent::CtrlKey)
+ return false;
+
bool canScrollX = m_scrollableArea->userInputScrollable(HorizontalScrollbar);
bool canScrollY = m_scrollableArea->userInputScrollable(VerticalScrollbar);
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698