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

Enable mnemonics in menu, fixes atom/atom#3844

Browse source
This commit is contained in:
Cheng Zhao 2014-10-16 21:22:22 +08:00
parent b41d356143
commit a95679c212
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_menu_views.cc
View file

@ -17,7 +17,9 @@ MenuViews::MenuViews() {
void MenuViews::Popup(Window* window) { void MenuViews::Popup(Window* window) {
gfx::Point cursor = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint(); gfx::Point cursor = gfx::Screen::GetNativeScreen()->GetCursorScreenPoint();
views::MenuRunner menu_runner(model(), views::MenuRunner::CONTEXT_MENU); views::MenuRunner menu_runner(
model(),
views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS);
ignore_result(menu_runner.RunMenuAt( ignore_result(menu_runner.RunMenuAt(
static_cast<NativeWindowViews*>(window->window())->widget(), static_cast<NativeWindowViews*>(window->window())->widget(),
NULL, NULL,

4
atom/browser/ui/views/menu_delegate.cc
View file

@ -35,7 +35,9 @@ void MenuDelegate::RunMenu(ui::MenuModel* model, views::MenuButton* button) {
id_ = button->tag(); id_ = button->tag();
views::MenuItemView* item = BuildMenu(model); views::MenuItemView* item = BuildMenu(model);
views::MenuRunner menu_runner(item, views::MenuRunner::CONTEXT_MENU); views::MenuRunner menu_runner(
item,
views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS);
ignore_result(menu_runner.RunMenuAt( ignore_result(menu_runner.RunMenuAt(
button->GetWidget()->GetTopLevelWidget(), button->GetWidget()->GetTopLevelWidget(),
button, button,

4
atom/browser/ui/win/notify_icon.cc
View file

@ -60,7 +60,9 @@ void NotifyIcon::HandleClickEvent(const gfx::Point& cursor_pos,
if (!SetForegroundWindow(window_)) if (!SetForegroundWindow(window_))
return; return;
views::MenuRunner menu_runner(menu_model_, views::MenuRunner::CONTEXT_MENU); views::MenuRunner menu_runner(
menu_model_,
views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS);
ignore_result(menu_runner.RunMenuAt( ignore_result(menu_runner.RunMenuAt(
NULL, NULL,
NULL, NULL,