projects
/
platform
/
framework
/
web
/
crosswalk-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7971ce0
)
disable accelerator when menu item is disabled
author
liusi
<siyuan.liu@autodesk.com>
Mon, 14 Nov 2016 04:29:27 +0000
(12:29 +0800)
committer
liusi
<siyuan.liu@autodesk.com>
Mon, 14 Nov 2016 04:29:27 +0000
(12:29 +0800)
atom/browser/ui/accelerator_util.cc
patch
|
blob
|
history
diff --git
a/atom/browser/ui/accelerator_util.cc
b/atom/browser/ui/accelerator_util.cc
index
eb89bf0
..
a7877a9
100644
(file)
--- a/
atom/browser/ui/accelerator_util.cc
+++ b/
atom/browser/ui/accelerator_util.cc
@@
-90,11
+90,12
@@
bool TriggerAcceleratorTableCommand(AcceleratorTable* table,
const ui::Accelerator& accelerator) {
if (ContainsKey(*table, accelerator)) {
const accelerator_util::MenuItem& item = (*table)[accelerator];
- i
tem.model->ActivatedAt(item.position);
-
return true
;
- } else {
- return false;
+ i
f (item.model->IsEnabledAt(item.position)) {
+
item.model->ActivatedAt(item.position)
;
+ return true;
+ }
}
+ return false;
}
} // namespace accelerator_util