Keep reference view pressed while extension actions have a popup

ui/views/controls/button/menu_button.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/button/menu_button.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 30 matching lines @@
 //
 // MenuButton - constructors, destructors, initialization
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 MenuButton::MenuButton(ButtonListener* listener,
                        const base::string16& text,
                        MenuButtonListener* menu_button_listener,
                        bool show_menu_marker)
     : LabelButton(listener, text),
-      menu_visible_(false),
+      menus_visible_(0),
       menu_offset_(kDefaultMenuOffsetX, kDefaultMenuOffsetY),
       listener_(menu_button_listener),
       show_menu_marker_(show_menu_marker),
       menu_marker_(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_MENU_DROPARROW).ToImageSkia()),
       destroyed_flag_(NULL) {
   SetHorizontalAlignment(gfx::ALIGN_LEFT);
 }
 
 MenuButton::~MenuButton() {
   if (destroyed_flag_)
     *destroyed_flag_ = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - Public APIs
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+void MenuButton::AttachMenu() {
+  DCHECK_GE(menus_visible_, 0);
+  ++menus_visible_;
+  SetState(STATE_PRESSED);
+}
+
+void MenuButton::DetachMenu() {
+  --menus_visible_;
+  DCHECK_GE(menus_visible_, 0);
+  // If this was the last menu, we need to reset the state manually since we
+  // don't respond to mouse movement while menus are visible.
+  if (menus_visible_ == 0) {
+    // We set "normal" and not "hot" because the likelihood is that the mouse is
+    // now somewhere else (user clicked elsewhere on screen to close the menu
+    // or selected an item) and we will inevitably refresh the hot state
+    // in the event the mouse _is_ over the view.
+    SetState(STATE_NORMAL);
+  }
+}
+
 bool MenuButton::Activate() {
   SetState(STATE_PRESSED);
+
+  // We're already showing a menu (even if it might not be the main menu for
+  // this button). Don't show another one.
+  if (menu_visible())
+    return false;
+
   if (listener_) {
     gfx::Rect lb = GetLocalBounds();
 
     // The position of the menu depends on whether or not the locale is
     // right-to-left.
     gfx::Point menu_position(lb.right(), lb.bottom());
     if (base::i18n::IsRTL())
       menu_position.set_x(lb.x());
 
     View::ConvertPointToScreen(this, &menu_position);
     if (base::i18n::IsRTL())
       menu_position.Offset(-menu_offset_.x(), menu_offset_.y());
     else
       menu_position.Offset(menu_offset_.x(), menu_offset_.y());
 
     int max_x_coordinate = GetMaximumScreenXCoordinate();
     if (max_x_coordinate && max_x_coordinate <= menu_position.x())
       menu_position.set_x(max_x_coordinate - 1);
 
     // We're about to show the menu from a mouse press. By showing from the
     // mouse press event we block RootView in mouse dispatching. This also
     // appears to cause RootView to get a mouse pressed BEFORE the mouse
     // release is seen, which means RootView sends us another mouse press no
     // matter where the user pressed. To force RootView to recalculate the
     // mouse target during the mouse press we explicitly set the mouse handler
     // to NULL.
     static_cast<internal::RootView*>(GetWidget()->GetRootView())->
         SetMouseHandler(NULL);
 
-    menu_visible_ = true;
+    AttachMenu();
 
     bool destroyed = false;
     destroyed_flag_ = &destroyed;
 
     listener_->OnMenuButtonClicked(this, menu_position);
 
     if (destroyed) {
       // The menu was deleted while showing. Don't attempt any processing.
       return false;
     }
 
     destroyed_flag_ = NULL;
 
-    menu_visible_ = false;
+    DetachMenu();
     menu_closed_time_ = TimeTicks::Now();
 
-    // Now that the menu has closed, we need to manually reset state to
-    // "normal" since the menu modal loop will have prevented normal
-    // mouse move messages from getting to this View. We set "normal"
-    // and not "hot" because the likelihood is that the mouse is now
-    // somewhere else (user clicked elsewhere on screen to close the menu
-    // or selected an item) and we will inevitably refresh the hot state
-    // in the event the mouse _is_ over the view.
-    SetState(STATE_NORMAL);
-
     // We must return false here so that the RootView does not get stuck
     // sending all mouse pressed events to us instead of the appropriate
     // target.
     return false;
   }
   return true;
 }
 
 void MenuButton::OnPaint(gfx::Canvas* canvas) {
   LabelButton::OnPaint(canvas);
@@ skipping 45 matching lines @@
   // triggerable and there's a context menu).
   if (GetDragOperations(event.location()) != ui::DragDropTypes::DRAG_NONE &&
       state() != STATE_DISABLED && !InDrag() && event.IsOnlyLeftMouseButton() &&
       HitTestPoint(event.location())) {
     Activate();
   } else {
     LabelButton::OnMouseReleased(event);
   }
 }
 
-// The reason we override View::OnMouseExited is because we get this event when
-// we display the menu. If we don't override this method then
-// BaseButton::OnMouseExited will get the event and will set the button's state
-// to STATE_NORMAL instead of keeping the state BM_PUSHED. This, in turn, will
-// cause the button to appear depressed while the menu is displayed.
-void MenuButton::OnMouseExited(const ui::MouseEvent& event) {
-  if ((state_ != STATE_DISABLED) && (!menu_visible_) && (!InDrag())) {
-    SetState(STATE_NORMAL);
-  }
+bool MenuButton::ShouldRespondToMouseMovement() {
+  // We should ignore mouse events while a menu is showing so the proper state
+  // (usually STATE_PRESSED) remains.
+  return menus_visible_ == 0;
 }
 
 void MenuButton::OnGestureEvent(ui::GestureEvent* event) {
   if (state() != STATE_DISABLED && event->type() == ui::ET_GESTURE_TAP &&
       !Activate()) {
     // When |Activate()| returns |false|, it means that a menu is shown and
     // has handled the gesture event. So, there is no need to further process
     // the gesture event here.
     return;
   }
@@ skipping 66 matching lines @@
   if (!GetWidget()) {
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds = GetWidget()->GetWorkAreaBoundsInScreen();
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views