From ec4cec815c92d45594a122fa399b48f62b0626b0 Mon Sep 17 00:00:00 2001 From: Lars Mueller Date: Sun, 23 Dec 2018 20:39:01 +0100 Subject: [PATCH] backport: fix:menubar item fgcolor (3-1-x) --- atom/browser/ui/views/menu_bar.cc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/atom/browser/ui/views/menu_bar.cc b/atom/browser/ui/views/menu_bar.cc index 679e9e44aaf61..1f0bbcddfb664 100644 --- a/atom/browser/ui/views/menu_bar.cc +++ b/atom/browser/ui/views/menu_bar.cc @@ -5,7 +5,6 @@ #include "atom/browser/ui/views/menu_bar.h" #include -#include #include "atom/browser/ui/views/menu_delegate.h" #include "atom/browser/ui/views/submenu_button.h" @@ -129,13 +128,11 @@ void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) { theme = ui::NativeTheme::GetInstanceForNativeUi(); if (theme) { #if defined(USE_X11) - const std::string menubar_selector = "GtkMenuBar#menubar"; - background_color_ = libgtkui::GetBgColor(menubar_selector); - - enabled_color_ = theme->GetSystemColor( - ui::NativeTheme::kColorId_EnabledMenuItemForegroundColor); - disabled_color_ = theme->GetSystemColor( - ui::NativeTheme::kColorId_DisabledMenuItemForegroundColor); + background_color_ = libgtkui::GetBgColor("GtkMenuBar#menubar"); + enabled_color_ = libgtkui::GetFgColor( + "GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel"); + disabled_color_ = libgtkui::GetFgColor( + "GtkMenuBar#menubar GtkMenuItem#menuitem:disabled GtkLabel"); #else background_color_ = theme->GetSystemColor(ui::NativeTheme::kColorId_MenuBackgroundColor);