diff options
Diffstat (limited to 'views/controls/menu/menu_host_root_view.cc')
-rw-r--r-- | views/controls/menu/menu_host_root_view.cc | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/views/controls/menu/menu_host_root_view.cc b/views/controls/menu/menu_host_root_view.cc index 0372261..dee5472 100644 --- a/views/controls/menu/menu_host_root_view.cc +++ b/views/controls/menu/menu_host_root_view.cc @@ -13,14 +13,10 @@ MenuHostRootView::MenuHostRootView(Widget* widget, SubmenuView* submenu) : RootView(widget), submenu_(submenu), - forward_drag_to_menu_controller_(true), - suspend_events_(false) { + forward_drag_to_menu_controller_(true) { } bool MenuHostRootView::OnMousePressed(const MouseEvent& event) { - if (suspend_events_) - return true; - forward_drag_to_menu_controller_ = ((event.x() < 0 || event.y() < 0 || event.x() >= width() || event.y() >= height()) || @@ -31,9 +27,6 @@ bool MenuHostRootView::OnMousePressed(const MouseEvent& event) { } bool MenuHostRootView::OnMouseDragged(const MouseEvent& event) { - if (suspend_events_) - return true; - if (forward_drag_to_menu_controller_ && GetMenuController()) { GetMenuController()->OnMouseDragged(submenu_, event); return true; @@ -41,38 +34,20 @@ bool MenuHostRootView::OnMouseDragged(const MouseEvent& event) { return RootView::OnMouseDragged(event); } -void MenuHostRootView::OnMouseReleased(const MouseEvent& event, - bool canceled) { - if (suspend_events_) - return; - - RootView::OnMouseReleased(event, canceled); +void MenuHostRootView::OnMouseReleased(const MouseEvent& event) { + RootView::OnMouseReleased(event); if (forward_drag_to_menu_controller_ && GetMenuController()) { forward_drag_to_menu_controller_ = false; - if (canceled) { - GetMenuController()->Cancel(MenuController::EXIT_ALL); - } else { - GetMenuController()->OnMouseReleased(submenu_, event); - } + GetMenuController()->OnMouseReleased(submenu_, event); } } void MenuHostRootView::OnMouseMoved(const MouseEvent& event) { - if (suspend_events_) - return; - RootView::OnMouseMoved(event); if (GetMenuController()) GetMenuController()->OnMouseMoved(submenu_, event); } -void MenuHostRootView::OnMouseExited(const MouseEvent& event) { - if (suspend_events_) - return; - - RootView::OnMouseExited(event); -} - bool MenuHostRootView::OnMouseWheel(const MouseWheelEvent& event) { #if defined(OS_LINUX) // ChromeOS uses MenuController to forward events like other |