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

Unified Diff: ui/views/style/platform_style_mac.mm

Issue 1904753002: MenuButton: support Mac look & feel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes :) Created 4 years, 8 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
« ui/views/style/platform_style.cc ('K') | « ui/views/style/platform_style.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/style/platform_style_mac.mm
diff --git a/ui/views/style/platform_style_mac.mm b/ui/views/style/platform_style_mac.mm
index 550d9b2d957931d4e1929235b8d62c5f6bd57970..b090941f43faf1c8e080b8d417e8892179e07e47 100644
--- a/ui/views/style/platform_style_mac.mm
+++ b/ui/views/style/platform_style_mac.mm
@@ -38,13 +38,36 @@ gfx::ImageSkia PlatformStyle::CreateComboboxArrow(bool is_enabled,
}
// static
+gfx::ImageSkia PlatformStyle::CreateMenuButtonArrow(bool is_enabled) {
+ const int kMenuButtonArrowWidth = 13;
+ return gfx::CreateVectorIcon(gfx::VectorIconId::MENU_BUTTON_ARROW_MAC,
+ kMenuButtonArrowWidth,
+ is_enabled ? SK_ColorWHITE : SK_ColorBLACK);
+}
+
+// static
std::unique_ptr<FocusableBorder> PlatformStyle::CreateComboboxBorder() {
return base::WrapUnique(new FocusableRoundedBorder);
}
// static
std::unique_ptr<Background> PlatformStyle::CreateComboboxBackground() {
- return base::WrapUnique(new ComboboxBackgroundMac);
+ // When creating the background, this function always assumes the combobox is
+ // in STYLE_NORMAL. Comboboxes do not paint their backgrounds in STYLE_ACTION,
+ // so that assumption is safe.
+ return base::WrapUnique(new ComboboxBackgroundMac(
+ GetComboboxShoulderWidth(Combobox::STYLE_NORMAL)));
+}
+
+// static
+std::unique_ptr<FocusableBorder> PlatformStyle::CreateMenuButtonBorder() {
+ return base::WrapUnique(new FocusableRoundedBorder);
+}
+
+// static
+std::unique_ptr<Background> PlatformStyle::CreateMenuButtonBackground() {
+ return base::WrapUnique(
+ new ComboboxBackgroundMac(GetMenuButtonShoulderWidth()));
}
// static
« ui/views/style/platform_style.cc ('K') | « ui/views/style/platform_style.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698