diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-03 22:51:52 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-03 22:51:52 +0000 |
| commit | 32e851ac4653283d8602cdf20ac1c689416389c8 (patch) | |
| tree | f2a332366a9f8b2965b0d70c0a4127aa1293c485 /views/controls/scroll_view.cc | |
| parent | d48fd7b8104831e3c5481ca1269f40a9b22271ae (diff) | |
| download | chromium_src-32e851ac4653283d8602cdf20ac1c689416389c8.zip chromium_src-32e851ac4653283d8602cdf20ac1c689416389c8.tar.gz chromium_src-32e851ac4653283d8602cdf20ac1c689416389c8.tar.bz2 | |
Checking in patch for Denis Romanov (originally reviewed here: http://codereview.chromium.org/651027).
Make mouse wheel scroll contents of views::ScrollView control in Linux (GTK).
BUG=26970
TEST=Make and run out/Debug/view_examples and scroll in ScrollView tab.
TBR=denisromanov
Review URL: http://codereview.chromium.org/667008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/scroll_view.cc')
| -rw-r--r-- | views/controls/scroll_view.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc index d484e74..ec0bffa 100644 --- a/views/controls/scroll_view.cc +++ b/views/controls/scroll_view.cc @@ -417,12 +417,10 @@ bool ScrollView::OnKeyPressed(const KeyEvent& event) { bool ScrollView::OnMouseWheel(const MouseWheelEvent& e) { bool processed = false; - // Give vertical scrollbar priority if (vert_sb_->IsVisible()) { processed = vert_sb_->OnMouseWheel(e); } - if (!processed && horiz_sb_->IsVisible()) { processed = horiz_sb_->OnMouseWheel(e); } |