From 5cd24a4e81b0d1fabd22ab1ce3d1b9c6530464a6 Mon Sep 17 00:00:00 2001 From: "trop[bot]" Date: Fri, 28 Sep 2018 10:01:28 -0700 Subject: [PATCH] fix: enable key accelerator flags for Windows and Linux (backport: 3-0-x) (#14859) * Fix Accelerator Flags for Windows and Linux * Lint fix * Lint whitespace --- atom/browser/ui/accelerator_util.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/atom/browser/ui/accelerator_util.cc b/atom/browser/ui/accelerator_util.cc index 63ea1489467c..8a8067c5a788 100644 --- a/atom/browser/ui/accelerator_util.cc +++ b/atom/browser/ui/accelerator_util.cc @@ -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; } }