github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-02-13 16:45:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

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