diff --git a/atom/browser/ui/views/menu_bar.cc b/atom/browser/ui/views/menu_bar.cc index 332a42b513a1e..e420ba3799099 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); diff --git a/patches/common/chromium/libgtkui_export.patch b/patches/common/chromium/libgtkui_export.patch index 4765ab890b04c..6f8315dc4a528 100644 --- a/patches/common/chromium/libgtkui_export.patch +++ b/patches/common/chromium/libgtkui_export.patch @@ -81,6 +81,15 @@ index d9f245070249f5f153bd8fe11e0a5e718c7d3629..a0f033c3e3f7f3996897f5f969b2a209 // Gets the transient parent aura window for |dialog|. aura::Window* GetAuraTransientParent(GtkWidget* dialog); +@@ -180,7 +181,7 @@ void ApplyCssToContext(GtkStyleContext* context, const std::string& css); + + // Get the 'color' property from the style context created by + // GetStyleContextFromCss(|css_selector|). +-SkColor GetFgColor(const std::string& css_selector); ++LIBGTKUI_EXPORT SkColor GetFgColor(const std::string& css_selector); + + ScopedCssProvider GetCssProvider(const std::string& css); + @@ -193,7 +194,7 @@ void RenderBackground(const gfx::Size& size, // Renders a background from the style context created by // GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and