github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7962 from liusy182/disable-accelerator

Browse Source 
disable accelerator when menu item is disabled
This commit is contained in:
Kevin Sawicki
2016-11-15 11:05:36 -08:00
committed by GitHub
parent 89feefac2c 9e91f319c1
commit 301b8ec39a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
atom/browser/ui/accelerator_util.cc
View File

@@ -90,11 +90,12 @@ bool TriggerAcceleratorTableCommand(AcceleratorTable* table,
const ui::Accelerator& accelerator) {
if (ContainsKey(*table, accelerator)) {
const accelerator_util::MenuItem& item = (*table)[accelerator];
item.model->ActivatedAt(item.position);
return true;
} else {
return false;
if (item.model->IsEnabledAt(item.position)) {
item.model->ActivatedAt(item.position);
return true;
}
}
return false;
}
} // namespace accelerator_util