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

Unified Diff: ui/views/controls/scroll_view.cc

Issue 456913002: MacViews: Support continuous scrolling and horizontal scrolling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix for rsesek Created 6 years, 3 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
Index: ui/views/controls/scroll_view.cc
diff --git a/ui/views/controls/scroll_view.cc b/ui/views/controls/scroll_view.cc
index ec83c884ff54220b7550995092b4e8757d4d2d68..d12c73b0732f75d9f434970fc16038c2f7e15908 100644
--- a/ui/views/controls/scroll_view.cc
+++ b/ui/views/controls/scroll_view.cc
@@ -354,12 +354,12 @@ bool ScrollView::OnKeyPressed(const ui::KeyEvent& event) {
bool ScrollView::OnMouseWheel(const ui::MouseWheelEvent& e) {
bool processed = false;
- // Give vertical scrollbar priority
+
if (vert_sb_->visible())
processed = vert_sb_->OnMouseWheel(e);
- if (!processed && horiz_sb_->visible())
- processed = horiz_sb_->OnMouseWheel(e);
+ if (horiz_sb_->visible())
+ processed = horiz_sb_->OnMouseWheel(e) || processed;
sky 2014/09/02 18:25:54 Why this change? Doesn't this mean we always send
Andre 2014/09/02 18:30:52 Yes, BaseScrollBar::OnMouseWheel always returns tr
return processed;
}

Powered by Google App Engine
This is Rietveld 408576698