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

fix: handle actionable submenus in GenerateAcceleratorTable()

Browse Source
This commit is contained in:
Charles Kerr
2024-01-23 10:31:10 -06:00
parent 1af9612edf
commit c1cdaf1d52
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
shell/browser/ui/accelerator_util.cc
View File

@@ -74,21 +74,14 @@ bool StringToAccelerator(const std::string& shortcut,
void GenerateAcceleratorTable(AcceleratorTable* table,
electron::ElectronMenuModel* model) {
size_t count = model->GetItemCount();
for (size_t i = 0; i < count; ++i) {
electron::ElectronMenuModel::ItemType type = model->GetTypeAt(i);
if (type == electron::ElectronMenuModel::TYPE_SUBMENU) {
auto* submodel = model->GetSubmenuModelAt(i);
GenerateAcceleratorTable(table, submodel);
} else {
ui::Accelerator accelerator;
if (model->ShouldRegisterAcceleratorAt(i)) {
if (model->GetAcceleratorAtWithParams(i, true, &accelerator)) {
MenuItem item = {i, model};
(*table)[accelerator] = item;
}
}
}
for (size_t i = 0, count = model->GetItemCount(); i < count; ++i) {
if (auto* const submenu = model->GetSubmenuModelAt(i))
GenerateAcceleratorTable(table, submenu);
if (ui::Accelerator accelerator;
model->ShouldRegisterAcceleratorAt(i) &&
model->GetAcceleratorAtWithParams(i, true, &accelerator))
table->insert_or_assign(std::move(accelerator), MenuItem{i, model});
}
}