Merge pull request #8984 from hansenzhang/display-menuitem-label
Fix '&' not showing in MenuItem label
This commit is contained in:
commit
b1275a8ef0
1 changed files with 1 additions and 12 deletions
|
@ -16,21 +16,10 @@
|
||||||
|
|
||||||
namespace atom {
|
namespace atom {
|
||||||
|
|
||||||
namespace {
|
|
||||||
|
|
||||||
// Filter out the "&" in menu label.
|
|
||||||
base::string16 FilterAccelerator(const base::string16& label) {
|
|
||||||
base::string16 out;
|
|
||||||
base::RemoveChars(label, base::ASCIIToUTF16("&").c_str(), &out);
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
SubmenuButton::SubmenuButton(const base::string16& title,
|
SubmenuButton::SubmenuButton(const base::string16& title,
|
||||||
views::MenuButtonListener* menu_button_listener,
|
views::MenuButtonListener* menu_button_listener,
|
||||||
const SkColor& background_color)
|
const SkColor& background_color)
|
||||||
: views::MenuButton(FilterAccelerator(title),
|
: views::MenuButton(gfx::RemoveAcceleratorChar(title, '&', NULL, NULL),
|
||||||
menu_button_listener, false),
|
menu_button_listener, false),
|
||||||
accelerator_(0),
|
accelerator_(0),
|
||||||
show_underline_(false),
|
show_underline_(false),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue