Commit 2812ff63 authored by Leonard Grey's avatar Leonard Grey Committed by Commit Bot

Use system color for default icons in GTK

Follow up to https://chromium-review.googlesource.com/c/chromium/src/+/1436948

Change-Id: I553d0a1d50aa764a79b163a8a3a26ab774e4e162
Reviewed-on: https://chromium-review.googlesource.com/c/1440525
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Auto-Submit: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#628423}
parent 67d2dc4a
...@@ -126,7 +126,6 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) { ...@@ -126,7 +126,6 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) {
case ui::NativeTheme::kColorId_HighlightedMenuItemForegroundColor: case ui::NativeTheme::kColorId_HighlightedMenuItemForegroundColor:
case ui::NativeTheme::kColorId_FocusedHighlightedMenuItemBackgroundColor: case ui::NativeTheme::kColorId_FocusedHighlightedMenuItemBackgroundColor:
case ui::NativeTheme::kColorId_MenuItemAlertBackgroundColor: case ui::NativeTheme::kColorId_MenuItemAlertBackgroundColor:
case ui::NativeTheme::kColorId_DefaultIconColor:
return ui::NativeTheme::GetInstanceForNativeUi()->GetSystemColor( return ui::NativeTheme::GetInstanceForNativeUi()->GetSystemColor(
color_id); color_id);
...@@ -322,6 +321,11 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) { ...@@ -322,6 +321,11 @@ SkColor SkColorFromColorId(ui::NativeTheme::ColorId color_id) {
return fallback_theme->GetSystemColor(color_id); return fallback_theme->GetSystemColor(color_id);
} }
case ui::NativeTheme::kColorId_DefaultIconColor:
if (GtkVersionCheck(3, 20))
return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem #radio");
return GetFgColor("GtkMenu#menu GtkMenuItem#menuitem.radio");
case ui::NativeTheme::kColorId_NumColors: case ui::NativeTheme::kColorId_NumColors:
NOTREACHED(); NOTREACHED();
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment