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

Unified Diff: ui/views/controls/menu/menu_controller.cc

Issue 2786693002: Add PointerDetails to ui::MouseEvent's constructors (Closed)
Patch Set: mouse event constructor Created 3 years, 9 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
Index: ui/views/controls/menu/menu_controller.cc
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 166ff527054ed088c87962ee6d355bf318d4c393..8c4cf1a256e7b92bf42109cc99324e7a21c2da5e 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -2509,14 +2509,18 @@ void MenuController::UpdateActiveMouseView(SubmenuView* event_source,
gfx::Point target_point(target_menu_loc);
View::ConvertPointToTarget(
target_menu, active_mouse_view, &target_point);
- ui::MouseEvent mouse_entered_event(ui::ET_MOUSE_ENTERED, target_point,
- target_point, ui::EventTimeForNow(), 0,
- 0);
+ ui::MouseEvent mouse_entered_event(
+ ui::ET_MOUSE_ENTERED, target_point, target_point,
+ ui::EventTimeForNow(), 0, 0,
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+ ui::PointerEvent::kMousePointerId));
active_mouse_view->OnMouseEntered(mouse_entered_event);
ui::MouseEvent mouse_pressed_event(
ui::ET_MOUSE_PRESSED, target_point, target_point,
- ui::EventTimeForNow(), event.flags(), event.changed_button_flags());
+ ui::EventTimeForNow(), event.flags(), event.changed_button_flags(),
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+ ui::PointerEvent::kMousePointerId));
active_mouse_view->OnMousePressed(mouse_pressed_event);
}
}
@@ -2526,7 +2530,9 @@ void MenuController::UpdateActiveMouseView(SubmenuView* event_source,
View::ConvertPointToTarget(target_menu, active_mouse_view, &target_point);
ui::MouseEvent mouse_dragged_event(
ui::ET_MOUSE_DRAGGED, target_point, target_point, ui::EventTimeForNow(),
- event.flags(), event.changed_button_flags());
+ event.flags(), event.changed_button_flags(),
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+ ui::PointerEvent::kMousePointerId));
active_mouse_view->OnMouseDragged(mouse_dragged_event);
}
}
@@ -2541,9 +2547,11 @@ void MenuController::SendMouseReleaseToActiveView(SubmenuView* event_source,
View::ConvertPointToScreen(event_source->GetScrollViewContainer(),
&target_loc);
View::ConvertPointFromScreen(active_mouse_view, &target_loc);
- ui::MouseEvent release_event(ui::ET_MOUSE_RELEASED, target_loc, target_loc,
- ui::EventTimeForNow(), event.flags(),
- event.changed_button_flags());
+ ui::MouseEvent release_event(
+ ui::ET_MOUSE_RELEASED, target_loc, target_loc, ui::EventTimeForNow(),
+ event.flags(), event.changed_button_flags(),
+ ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+ ui::PointerEvent::kMousePointerId));
// Reset active mouse view before sending mouse released. That way if it calls
// back to us, we aren't in a weird state.
SetActiveMouseView(NULL);

Powered by Google App Engine
This is Rietveld 408576698