mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: use GetAuraColor to get theme dependant menu bg color (#19469)

Browse source
This commit is contained in:
Samuel Attard 2019-07-29 08:33:43 -07:00 • committed by Charles Kerr
parent 5e930bf940
commit 4838bd7834
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/ui/views/menu_bar.cc
View file

@ -12,6 +12,7 @@
#include "shell/common/keyboard_util.h" #include "shell/common/keyboard_util.h"
#include "ui/aura/window.h" #include "ui/aura/window.h"
#include "ui/base/models/menu_model.h" #include "ui/base/models/menu_model.h"
#include "ui/native_theme/common_theme.h"
#include "ui/views/background.h" #include "ui/views/background.h"
#include "ui/views/layout/box_layout.h" #include "ui/views/layout/box_layout.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
@ -297,12 +298,9 @@ void MenuBar::RefreshColorCache() {
"GtkMenuBar#menubar GtkMenuItem#menuitem:disabled GtkLabel"); "GtkMenuBar#menubar GtkMenuItem#menuitem:disabled GtkLabel");
#else #else
background_color_ = background_color_ =
theme->GetSystemColor(ui::NativeTheme::kColorId_MenuBackgroundColor); ui::GetAuraColor(ui::NativeTheme::kColorId_MenuBackgroundColor, theme);
#endif #endif
} }
#if defined(OS_WIN)
background_color_ = color_utils::GetSysSkColor(COLOR_MENUBAR);
#endif
} }
void MenuBar::OnThemeChanged() { void MenuBar::OnThemeChanged() {