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

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
commit 301b8ec39a
1 changed files with 5 additions and 4 deletions
Show stats 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) { const ui::Accelerator& accelerator) {
if (ContainsKey(*table, accelerator)) { if (ContainsKey(*table, accelerator)) {
const accelerator_util::MenuItem& item = (*table)[accelerator]; const accelerator_util::MenuItem& item = (*table)[accelerator];
item.model->ActivatedAt(item.position); if (item.model->IsEnabledAt(item.position)) {
return true; item.model->ActivatedAt(item.position);
} else { return true;
return false; }
} }
return false;
} }
} // namespace accelerator_util } // namespace accelerator_util