Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #111711 from bruvzg/pop_sh_gl_m

Browse source 
[PopupMenu] Update global menu shortcuts when shortcut is externally changed.
This commit is contained in:
Thaddeus Crews 2025-11-25 12:55:08 -06:00
commit 5cf4d2042f
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scene/gui/popup_menu.cpp
View file

@ -137,8 +137,8 @@ RID PopupMenu::bind_global_menu() {
nmenu->set_item_tooltip(global_menu, index, item.tooltip); nmenu->set_item_tooltip(global_menu, index, item.tooltip);
if (!item.shortcut_is_disabled && item.shortcut.is_valid() && item.shortcut->has_valid_event()) { if (!item.shortcut_is_disabled && item.shortcut.is_valid() && item.shortcut->has_valid_event()) {
Array events = item.shortcut->get_events(); Array events = item.shortcut->get_events();
for (int j = 0; j < events.size(); j++) { for (const Variant &v : events) {
Ref<InputEventKey> ie = events[j]; Ref<InputEventKey> ie = v;
if (ie.is_valid() && _set_item_accelerator(index, ie)) { if (ie.is_valid() && _set_item_accelerator(index, ie)) {
break; break;
} }
@ -2984,7 +2984,26 @@ void PopupMenu::_unref_shortcut(Ref<Shortcut> p_sc) {
void PopupMenu::_shortcut_changed() { void PopupMenu::_shortcut_changed() {
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {
items.write[i].dirty = true; Item &item = items.write[i];
item.dirty = true;
if (global_menu.is_valid() && !item.separator) {
NativeMenu *nmenu = NativeMenu::get_singleton();
nmenu->set_item_accelerator(global_menu, i, Key::NONE);
if (!item.shortcut_is_disabled && item.shortcut.is_valid() && item.shortcut->has_valid_event()) {
Array events = item.shortcut->get_events();
for (const Variant &v : events) {
Ref<InputEventKey> ie = v;
if (ie.is_valid() && _set_item_accelerator(i, ie)) {
break;
}
}
if (item.shortcut_is_global) {
nmenu->set_item_key_callback(global_menu, i, callable_mp(this, &PopupMenu::activate_item));
} else {
nmenu->set_item_key_callback(global_menu, i, Callable());
}
}
}
} }
control->queue_redraw(); control->queue_redraw();
} }