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

Unified Diff: ui/base/events/event.cc

Issue 16950030: Handle alternate types in HandleMouseEvent. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Move virtual override to end of class/public. Created 7 years, 6 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
« no previous file with comments | « ui/base/events/event.h ('k') | ui/views/widget/native_widget_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/events/event.cc
diff --git a/ui/base/events/event.cc b/ui/base/events/event.cc
index 1ade95089d71155417d566f3842a6888a4e01ac9..e976e9a8910258af02ec67370807bb05ac7f59aa 100644
--- a/ui/base/events/event.cc
+++ b/ui/base/events/event.cc
@@ -419,6 +419,12 @@ MouseWheelEvent::MouseWheelEvent(const MouseEvent& mouse_event,
DCHECK(type() == ET_MOUSEWHEEL);
}
+MouseWheelEvent::MouseWheelEvent(const MouseWheelEvent& mouse_wheel_event)
+ : MouseEvent(mouse_wheel_event),
+ offset_(mouse_wheel_event.offset()) {
+ DCHECK(type() == ET_MOUSEWHEEL);
+}
+
#if defined(OS_WIN)
// This value matches windows WHEEL_DELTA.
// static
@@ -428,6 +434,18 @@ const int MouseWheelEvent::kWheelDelta = 120;
const int MouseWheelEvent::kWheelDelta = 53;
#endif
+void MouseWheelEvent::UpdateForRootTransform(
+ const gfx::Transform& inverted_root_transform) {
+ LocatedEvent::UpdateForRootTransform(inverted_root_transform);
+ gfx::DecomposedTransform decomp;
+ bool success = gfx::DecomposeTransform(&decomp, inverted_root_transform);
+ DCHECK(success);
+ if (decomp.scale[0])
+ offset_.set_x(offset_.x() * decomp.scale[0]);
+ if (decomp.scale[1])
+ offset_.set_y(offset_.y() * decomp.scale[1]);
+}
+
////////////////////////////////////////////////////////////////////////////////
// TouchEvent
« no previous file with comments | « ui/base/events/event.h ('k') | ui/views/widget/native_widget_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698