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

views: Draw underline in menu bar for accelerators.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-18 13:36:00 +08:00
parent e25417ab31
commit 965f2b1b6b
4 changed files with 124 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/ui/views/menu_bar.cc
View file

@ -9,11 +9,9 @@
#endif
#include "atom/browser/ui/views/menu_delegate.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "atom/browser/ui/views/submenu_button.h"
#include "ui/base/models/menu_model.h"
#include "ui/views/background.h"
#include "ui/views/controls/button/menu_button.h"
#include "ui/views/layout/box_layout.h"
#if defined(OS_WIN)
@ -32,13 +30,6 @@ const char kViewClassName[] = "AtomMenuBar";
// Default color of the menu bar.
const SkColor kDefaultColor = SkColorSetARGB(255, 233, 233, 233);
// Filter out the "&" in menu label.
base::string16 FilterMenuButtonLabel(const base::string16& label) {
base::string16 out;
base::RemoveChars(label, base::ASCIIToUTF16("&").c_str(), &out);
return out;
}
#if defined(USE_X11)
void GetMenuBarColor(SkColor* enabled, SkColor* disabled, SkColor* highlight,
SkColor* hover, SkColor* background) {
@ -79,8 +70,7 @@ void MenuBar::SetMenu(ui::MenuModel* model) {
RemoveAllChildViews(true);
for (int i = 0; i < model->GetItemCount(); ++i) {
views::MenuButton* button = new views::MenuButton(
this, FilterMenuButtonLabel(model->GetLabelAt(i)), this, false);
SubmenuButton* button = new SubmenuButton(this, model->GetLabelAt(i), this);
button->set_tag(i);
#if defined(USE_X11)
@ -88,6 +78,7 @@ void MenuBar::SetMenu(ui::MenuModel* model) {
button->SetDisabledColor(disabled_color_);
button->SetHighlightColor(highlight_color_);
button->SetHoverColor(hover_color_);
button->SetUnderlineColor(enabled_color_);
#endif
AddChildView(button);