diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 05:02:47 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-01 05:02:47 +0000 |
| commit | 34db5a0c34ea52603d1a294eafaeb4da438a555a (patch) | |
| tree | 485c0936ff0e3e8ab12b75d58290337f095b00dd /views/events | |
| parent | 7324d1d0a602a7153558d17e06edefed0076b502 (diff) | |
| download | chromium_src-34db5a0c34ea52603d1a294eafaeb4da438a555a.zip chromium_src-34db5a0c34ea52603d1a294eafaeb4da438a555a.tar.gz chromium_src-34db5a0c34ea52603d1a294eafaeb4da438a555a.tar.bz2 | |
Parse ui::ET_MOUSEWHEEL on XEvent ButtonRelease and XI_ButtonRelease too.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/6596047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/events')
| -rw-r--r-- | views/events/event_x.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/views/events/event_x.cc b/views/events/event_x.cc index 4fa63be..189b70b 100644 --- a/views/events/event_x.cc +++ b/views/events/event_x.cc @@ -128,6 +128,9 @@ ui::EventType EventTypeFromNative(NativeEvent2 native_event) { return ui::ET_MOUSEWHEEL; return ui::ET_MOUSE_PRESSED; case ButtonRelease: + if (native_event->xbutton.button == 4 || + native_event->xbutton.button == 5) + return ui::ET_MOUSEWHEEL; return ui::ET_MOUSE_RELEASED; case MotionNotify: if (native_event->xmotion.state & @@ -143,7 +146,8 @@ ui::EventType EventTypeFromNative(NativeEvent2 native_event) { return (xievent->detail == 4 || xievent->detail == 5) ? ui::ET_MOUSEWHEEL : ui::ET_MOUSE_PRESSED; case XI_ButtonRelease: - return ui::ET_MOUSE_RELEASED; + return (xievent->detail == 4 || xievent->detail == 5) ? + ui::ET_MOUSEWHEEL : ui::ET_MOUSE_RELEASED; case XI_Motion: return GetButtonMaskForX2Event(xievent) ? ui::ET_MOUSE_DRAGGED : ui::ET_MOUSE_MOVED; |