summaryrefslogtreecommitdiffstats
path: root/views/controls/menu/submenu_view.cc
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 23:03:32 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 23:03:32 +0000
commit47504c3539db2a146559f2ed0bd97098831591ed (patch)
tree004d9e1e2d6892497263d2fa5ca3177cca382900 /views/controls/menu/submenu_view.cc
parent0c8f21e59c0d0db06f7e47aca450ca2419915354 (diff)
downloadchromium_src-47504c3539db2a146559f2ed0bd97098831591ed.zip
chromium_src-47504c3539db2a146559f2ed0bd97098831591ed.tar.gz
chromium_src-47504c3539db2a146559f2ed0bd97098831591ed.tar.bz2
Make linux MouseWheelEvent consistent with win.
Also reverted SubmenuView scroll direction change in r73996. BUG=chromium:72320 TEST=Views scroll should be consistent on all platforms per chromium:72320 Review URL: http://codereview.chromium.org/6453008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu/submenu_view.cc')
-rw-r--r--views/controls/menu/submenu_view.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/views/controls/menu/submenu_view.cc b/views/controls/menu/submenu_view.cc
index 2a81484..a3428f7 100644
--- a/views/controls/menu/submenu_view.cc
+++ b/views/controls/menu/submenu_view.cc
@@ -200,7 +200,7 @@ bool SubmenuView::OnMouseWheel(const MouseWheelEvent& e) {
#elif defined(OS_LINUX)
int delta = abs(e.GetOffset());
#endif
- for (bool scroll_up = (e.GetOffset() < 0); delta != 0; --delta) {
+ for (bool scroll_up = (e.GetOffset() > 0); delta != 0; --delta) {
int scroll_target;
if (scroll_up) {
if (GetMenuItemAt(first_vis_index)->y() == vis_bounds.y()) {