MenuButton: support Mac look & feel

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"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_switches_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/animation/ink_drop_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
+#include "ui/views/controls/focusable_border.h"
 #include "ui/views/mouse_constants.h"
 #include "ui/views/resources/grit/views_resources.h"
+#include "ui/views/style/platform_style.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 
 using base::TimeTicks;
 using base::TimeDelta;
 
 namespace views {
 
 // Default menu offset.
 static const int kDefaultMenuOffsetX = -2;
@@ skipping 30 matching lines @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 MenuButton::MenuButton(const base::string16& text,
                        MenuButtonListener* menu_button_listener,
                        bool show_menu_marker)
     : LabelButton(nullptr, text),
       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_(nullptr),
       pressed_lock_count_(0),
       increment_pressed_lock_called_(nullptr),
       should_disable_after_press_(false),
       weak_factory_(this) {
   SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  SetBorder(PlatformStyle::CreateMenuButtonBorder());

[tapted, 2016/04/27 03:25:11]

The issue with the MenuButton subclass used for the origin info bubble still
isn't resolved -- patching this in, it still looks like
http://crbug.com/605161#c4, which is a regression we don't want. See my earlier
comment at
https://codereview.chromium.org/1904753002/diff/40001/ui/views/controls/butto...
- it might have gone missing since it was a thread on an older patchset.

[Elly Fong-Jones, 2016/04/28 17:03:12]

Ick. Whether the subclasses need borders or not seems to vary individually. I
added a protected virtual method 'ShouldUseBorder' to decide whether to
construct a border, and made it default to false, so we can make individual
subclasses use the border if needed. I also fixed up the layout code in
PaintMenuMarker() to work properly when there's no border.

+  if (show_menu_marker_) {
+    marker_image_ = PlatformStyle::CreateMenuButtonArrow(enabled());
+    set_background(PlatformStyle::CreateMenuButtonBackground(GetShoulderWidth())
+                       .release());
+  }
 }
 
 MenuButton::~MenuButton() {
   if (destroyed_flag_)
     *destroyed_flag_ = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - Public APIs
@@ skipping 94 matching lines @@
   if (show_menu_marker_)
     PaintMenuMarker(canvas);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuButton - Events
 //
 ////////////////////////////////////////////////////////////////////////////////
 
+int MenuButton::GetShoulderWidth() const {

[tapted, 2016/04/27 03:25:11]

move definition to end of file

[Elly Fong-Jones, 2016/04/28 17:03:11]

Done.

+  const int kPadding = 7;
+  if (!show_menu_marker_)
+    return 0;
+  return marker_image_.width() + 2 * kPadding;
+}
+
 gfx::Size MenuButton::GetPreferredSize() const {
   gfx::Size prefsize = LabelButton::GetPreferredSize();
-  if (show_menu_marker_) {
-    prefsize.Enlarge(menu_marker_->width() + kMenuMarkerPaddingLeft +
-                         kMenuMarkerPaddingRight,
-                     0);
-  }
+  prefsize.Enlarge(GetShoulderWidth(), 0);
   return prefsize;
 }
 
 const char* MenuButton::GetClassName() const {
   return kViewClassName;
 }
 
 bool MenuButton::OnMousePressed(const ui::MouseEvent& event) {
   if (request_focus_on_press())
     RequestFocus();
@@ skipping 88 matching lines @@
   return false;
 }
 
 void MenuButton::GetAccessibleState(ui::AXViewState* state) {
   CustomButton::GetAccessibleState(state);
   state->role = ui::AX_ROLE_POP_UP_BUTTON;
   state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
   state->AddStateFlag(ui::AX_STATE_HASPOPUP);
 }
 
+void MenuButton::OnEnabledChanged() {
+  if (show_menu_marker_)
+    marker_image_ = PlatformStyle::CreateMenuButtonArrow(enabled());
+  LabelButton::OnEnabledChanged();
+}
+
 void MenuButton::PaintMenuMarker(gfx::Canvas* canvas) {
   gfx::Insets insets = GetInsets();
 
   // Using the Views mirroring infrastructure incorrectly flips icon content.
   // Instead, manually mirror the position of the down arrow.
-  gfx::Rect arrow_bounds(width() - insets.right() -
-                         menu_marker_->width() - kMenuMarkerPaddingRight,
-                         height() / 2 - menu_marker_->height() / 2,
-                         menu_marker_->width(),
-                         menu_marker_->height());
+  gfx::Rect arrow_bounds(width() - insets.right() - GetShoulderWidth(), 0,
+                         GetShoulderWidth(), height());
+  arrow_bounds.ClampToCenteredSize(marker_image_.size());
   arrow_bounds.set_x(GetMirroredXForRect(arrow_bounds));
-  canvas->DrawImageInt(*menu_marker_, arrow_bounds.x(), arrow_bounds.y());
+  canvas->DrawImageInt(marker_image_, arrow_bounds.x(), arrow_bounds.y());
 }
 
 gfx::Rect MenuButton::GetChildAreaBounds() {
-  gfx::Size s = size();
-
-  if (show_menu_marker_) {
-    s.set_width(s.width() - menu_marker_->width() - kMenuMarkerPaddingLeft -
-                kMenuMarkerPaddingRight);
-  }
-
-  return gfx::Rect(s);
+  return gfx::Rect(width() - GetShoulderWidth(), height());
 }
 
 bool MenuButton::IsTriggerableEvent(const ui::Event& event) {
   if (!IsTriggerableEventType(event))
     return false;
 
   TimeDelta delta = TimeTicks::Now() - menu_closed_time_;
   if (delta.InMilliseconds() < kMinimumMsBetweenButtonClicks)
     return false;  // Not enough time since the menu closed.
 
@@ skipping 62 matching lines @@
   if (!GetWidget()) {
     NOTREACHED();
     return 0;
   }
 
   gfx::Rect monitor_bounds = GetWidget()->GetWorkAreaBoundsInScreen();
   return monitor_bounds.right() - 1;
 }
 
 }  // namespace views