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

Unified Diff: ui/views/test/event_generator_delegate_mac.mm

Issue 2455143003: Fix mouse wheel events processing. (Closed)
Patch Set: Fix review issues. Created 4 years, 1 month 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 | « no previous file | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/event_generator_delegate_mac.mm
diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm
index 55005ea2c4647103ab53c465a2105e3f0cd20934..37a403c804cff2765a72ae4ded85e6583c6e361e 100644
--- a/ui/views/test/event_generator_delegate_mac.mm
+++ b/ui/views/test/event_generator_delegate_mac.mm
@@ -217,6 +217,17 @@ NSEvent* CreateMouseEventInWindow(NSWindow* window,
pressure:1.0];
}
+NSEvent* CreateMouseWheelEventInWindow(NSWindow* window,
+ const ui::MouseEvent* mouse_event) {
+ DCHECK_EQ(mouse_event->type(), ui::ET_MOUSEWHEEL);
+ const ui::MouseWheelEvent* mouse_wheel_event =
+ mouse_event->AsMouseWheelEvent();
+ return cocoa_test_event_utils::TestScrollEvent(
+ ConvertRootPointToTarget(window, mouse_wheel_event->location()), window,
+ mouse_wheel_event->x_offset(), mouse_wheel_event->y_offset(), false,
+ NSEventPhaseNone, NSEventPhaseNone);
+}
+
// Implementation of ui::test::EventGeneratorDelegate for Mac. Everything
// defined inline is just a stub. Interesting overrides are defined below the
// class.
@@ -349,10 +360,12 @@ EventGeneratorDelegateMac::GetChildIterator() const {
}
void EventGeneratorDelegateMac::OnMouseEvent(ui::MouseEvent* event) {
- NSEvent* ns_event = CreateMouseEventInWindow(window_,
- event->type(),
- event->location(),
- event->changed_button_flags());
+ NSEvent* ns_event =
+ event->type() == ui::ET_MOUSEWHEEL
+ ? CreateMouseWheelEventInWindow(window_, event)
+ : CreateMouseEventInWindow(window_, event->type(), event->location(),
+ event->changed_button_flags());
+
if (owner_->targeting_application())
[NSApp sendEvent:ns_event];
else
« no previous file with comments | « no previous file | ui/views/widget/native_widget_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698