Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: enable key accelerator flags for Windows and Linux (backport: 2-0-x) #14858

Merged
merged 3 commits into from Sep 28, 2018
Merged

fix: enable key accelerator flags for Windows and Linux (backport: 2-0-x) #14858

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
156a075
Fix Accelerator Flags for Windows and Linux
Sep 27, 2018
b262fb2
Lint fix
Sep 27, 2018
7eb1601
Lint whitespace
Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion atom/browser/ui/accelerator_util.cc
View file
Open in desktop
Expand Up @@ -91,7 +91,9 @@ bool TriggerAcceleratorTableCommand(AcceleratorTable* table,
if (base::ContainsKey(*table, accelerator)) {
const accelerator_util::MenuItem& item = (*table)[accelerator];
if (item.model->IsEnabledAt(item.position)) {
item.model->ActivatedAt(item.position);
const auto event_flags =
accelerator.MaskOutKeyEventFlags(accelerator.modifiers());
item.model->ActivatedAt(item.position, event_flags);
return true;
}
}
Expand Down