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

views: Always hide accelerator when submenu is activated.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-18 14:58:52 +08:00
parent a230daa998
commit b8bfe8a9ad
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,10 +101,8 @@ int MenuBar::GetAcceleratorIndex(base::char16 key) {
void MenuBar::ActivateAccelerator(base::char16 key) { void MenuBar::ActivateAccelerator(base::char16 key) {
int i = GetAcceleratorIndex(key); int i = GetAcceleratorIndex(key);
if (i != -1) { if (i != -1)
SetAcceleratorVisibility(false);
static_cast<SubmenuButton*>(child_at(i))->Activate(); static_cast<SubmenuButton*>(child_at(i))->Activate();
}
} }
int MenuBar::GetItemCount() const { int MenuBar::GetItemCount() const {
@ -143,6 +141,9 @@ void MenuBar::ButtonPressed(views::Button* sender, const ui::Event& event) {
void MenuBar::OnMenuButtonClicked(views::View* source, void MenuBar::OnMenuButtonClicked(views::View* source,
const gfx::Point& point) { const gfx::Point& point) {
// Hide the accelerator when a submenu is activated.
SetAcceleratorVisibility(false);
if (!menu_model_) if (!menu_model_)
return; return;