diff options
author | Rémi Verschelde <remi@verschelde.fr> | 2021-08-11 11:20:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-11 11:20:45 +0200 |
commit | c00303ff55f2a67d5cb1a031070e3b1fe7b15a9e (patch) | |
tree | 41c169c558961c715283d70822a703bd0a7c0706 /scene/gui | |
parent | a902f760634432adcb5f74b3b6cd27a7275a320f (diff) | |
parent | fa3a32a2d6b054543645b0d4752514c90732b935 (diff) |
Merge pull request #47378 from aaronfranke/use-input-enums
Use key enum instead of plain integers for input code
Diffstat (limited to 'scene/gui')
-rw-r--r-- | scene/gui/popup_menu.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 44f7200cd7..4bd88fde5f 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -1274,13 +1274,13 @@ int PopupMenu::get_item_count() const { } bool PopupMenu::activate_item_by_event(const Ref<InputEvent> &p_event, bool p_for_global_only) { - uint32_t code = 0; + Key code = KEY_NONE; Ref<InputEventKey> k = p_event; if (k.is_valid()) { code = k->get_keycode(); - if (code == 0) { - code = k->get_unicode(); + if (code == KEY_NONE) { + code = (Key)k->get_unicode(); } if (k->is_ctrl_pressed()) { code |= KEY_MASK_CTRL; |