MenuButton: support Mac look & feel

ui/views/style/mac/combobox_background_mac.cc

 // Copyright 2016 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/style/mac/combobox_background_mac.h"
 
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/scoped_canvas.h"
 #include "ui/native_theme/native_theme_mac.h"
 #include "ui/views/controls/combobox/combobox.h"

[tapted, 2016/04/21 06:06:46]

can this be removed now? (or replaced with view.h?)

[Elly Fong-Jones, 2016/04/21 15:30:26]

Done.

 #include "ui/views/view.h"
 
 using ui::NativeThemeMac;
 
 namespace views {
 
-ComboboxBackgroundMac::ComboboxBackgroundMac() {}
+ComboboxBackgroundMac::ComboboxBackgroundMac(int width) : width_(width) {}
 
 ComboboxBackgroundMac::~ComboboxBackgroundMac() {}
 
 void ComboboxBackgroundMac::Paint(gfx::Canvas* canvas, View* view) const {
-  DCHECK_EQ(view->GetClassName(), Combobox::kViewClassName);
-  Combobox* combobox = static_cast<Combobox*>(view);
+  gfx::RectF bounds(view->GetLocalBounds());
+  gfx::ScopedCanvas scoped_canvas(canvas);
 
-  gfx::RectF bounds(combobox->GetLocalBounds());
+  if (base::i18n::IsRTL()) {

[tapted, 2016/04/21 06:06:46]

Should we plonk this on gfx::ScopedCanvas - Maybe inherit from ScopedCanvas with
a ScopedRTLFlippedCanvas? I feel like this pattern comes up a whole bunch, and
the code is a bit like voodoo. 

gfx::Canvas already has a base::i18n::IsRTL dependency, so I don't think there
will be any complaints putting it into scoped_canvas.h

[Elly Fong-Jones, 2016/04/21 15:30:26]

Done.

+    canvas->Translate(gfx::Vector2d(bounds.width(), 0));
+    canvas->Scale(-1, 1);
+  }
+
   // Inset the left side far enough to draw only the arrow button, and inset the
   // other three sides by half a pixel so the edge of the background doesn't
   // paint outside the border.
-  bounds.Inset(bounds.width() - combobox->GetArrowButtonWidth(), 0.5, 0.5, 0.5);
+  bounds.Inset(bounds.width() - width_, 0.5, 0.5, 0.5);
 
   // TODO(tapted): Check whether the Widget is active, and use the NORMAL
   // BackgroundType if it is inactive. Handling this properly also requires the
   // control to observe the Widget for activation changes and invalidate.
   NativeThemeMac::ButtonBackgroundType type =
       NativeThemeMac::ButtonBackgroundType::HIGHLIGHTED;
-  if (!combobox->enabled())
+  if (!view->enabled())
     type = NativeThemeMac::ButtonBackgroundType::DISABLED;
 
   SkPaint paint;
   paint.setShader(
       NativeThemeMac::GetButtonBackgroundShader(type, bounds.height()));
   paint.setStyle(SkPaint::kFill_Style);
   paint.setAntiAlias(true);
 
   SkPoint no_curve = SkPoint::Make(0, 0);
   SkPoint curve = SkPoint::Make(
       ui::NativeThemeMac::kComboboxCornerRadius,
       ui::NativeThemeMac::kComboboxCornerRadius);
   SkVector curves[4] = { no_curve, curve, curve, no_curve };
 
   SkRRect fill_rect;
   fill_rect.setRectRadii(gfx::RectFToSkRect(bounds), curves);
 
   SkPath path;
   path.addRRect(fill_rect);
 
   canvas->DrawPath(path, paint);
 }
 
 }  // namespace views