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

Unified Diff: chrome/browser/ui/libgtkui/native_theme_gtk3.cc

Issue 2700473002: MenuItemView: use disabled text color for subtitles too (Closed)
Patch Set: Created 3 years, 10 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
« no previous file with comments | « no previous file | ui/views/controls/menu/menu_item_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtkui/native_theme_gtk3.cc
diff --git a/chrome/browser/ui/libgtkui/native_theme_gtk3.cc b/chrome/browser/ui/libgtkui/native_theme_gtk3.cc
index cae8210567310422c45f3f9273730e01c8f4b70b..d0a7dbdad724d7d06e1fce6d9cc6775909165565 100644
--- a/chrome/browser/ui/libgtkui/native_theme_gtk3.cc
+++ b/chrome/browser/ui/libgtkui/native_theme_gtk3.cc
@@ -112,6 +112,9 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) {
case ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor:
return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem:disabled GtkLabel");
case ui::NativeTheme::kColorId_MenuItemSubtitleColor:
+ if (GtkVersionCheck(3, 20)) {
+ return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem #accelerator");
Tom (Use chromium acct) 2017/02/15 21:33:18 This was actually fine before, but this is more te
Elliot Glaysher 2017/02/15 21:48:19 The best kind of correct!
+ }
return GetFgColor(
"GtkMenu#menu GtkMenuItem#menuitem GtkLabel.accelerator");
case ui::NativeTheme::kColorId_MenuSeparatorColor:
@@ -122,9 +125,8 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) {
if (GtkVersionCheck(3, 20)) {
return GetSeparatorColor(
"GtkMenu#menu GtkSeparator#separator.horizontal");
- } else {
- return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem.separator");
}
+ return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem.separator");
// Label
case ui::NativeTheme::kColorId_LabelEnabledColor:
« no previous file with comments | « no previous file | ui/views/controls/menu/menu_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698