diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 21:22:12 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 21:22:12 +0000 |
| commit | 884cef8f1a6f00d95f686e5cdba9b147ab4aa8a9 (patch) | |
| tree | d875a3c455224c8569cd642926792cb4504d40d7 /ui/base | |
| parent | e99cd4dca809897000378a6a4c567ab7aa8dce2b (diff) | |
| download | chromium_src-884cef8f1a6f00d95f686e5cdba9b147ab4aa8a9.zip chromium_src-884cef8f1a6f00d95f686e5cdba9b147ab4aa8a9.tar.gz chromium_src-884cef8f1a6f00d95f686e5cdba9b147ab4aa8a9.tar.bz2 | |
Better mouse support for metro aura
-Wheel, r-click and l-click now discriminated
-More efficient, clean mouse event handling
Note; wheel event not properly handled. That is a bigger CL
that will come later.
BUG=151718
TEST= right click and left click
Review URL: https://codereview.chromium.org/11312025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166034 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/events/event.cc | 5 | ||||
| -rw-r--r-- | ui/base/events/event.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ui/base/events/event.cc b/ui/base/events/event.cc index 6a44c33..5086822 100644 --- a/ui/base/events/event.cc +++ b/ui/base/events/event.cc @@ -275,6 +275,11 @@ MouseWheelEvent::MouseWheelEvent(const ScrollEvent& scroll_event) set_type(ET_MOUSEWHEEL); } +MouseWheelEvent::MouseWheelEvent(const MouseEvent& mouse_event, int offset) + : MouseEvent(mouse_event), offset_(offset) { + DCHECK(type() == ET_MOUSEWHEEL); +} + #if defined(OS_WIN) // This value matches windows WHEEL_DELTA. // static diff --git a/ui/base/events/event.h b/ui/base/events/event.h index 4f2da00..61cf81b 100644 --- a/ui/base/events/event.h +++ b/ui/base/events/event.h @@ -369,6 +369,7 @@ class UI_EXPORT MouseWheelEvent : public MouseEvent { explicit MouseWheelEvent(const base::NativeEvent& native_event); explicit MouseWheelEvent(const ScrollEvent& scroll_event); + MouseWheelEvent(const MouseEvent& mouse_event, int offset); template <class T> MouseWheelEvent(const MouseWheelEvent& model, |