diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-24 16:52:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-24 16:52:52 +0100 |
| commit | 65305ea00100069e4155dcc0b795ea302b515a5a (patch) | |
| tree | b32442b3307db45b77ba4c5251ca722443355320 | |
| parent | 7f8bfd6ed17b9b4f3ae93deb506e250fba43e452 (diff) | |
| parent | d91e915d7978b36e0741f6e0c01173bc1b72a97e (diff) | |
Merge pull request #46371 from EricEzaM/PR/fix-osx-inputmap-spammed-errors
Fixed 'nonexistent action' errors spammed at startup on OSX
| -rw-r--r-- | core/input/input_map.cpp | 2 | ||||
| -rw-r--r-- | scene/gui/rich_text_label.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/input/input_map.cpp b/core/input/input_map.cpp index 029808ebbe..e0b25fa092 100644 --- a/core/input/input_map.cpp +++ b/core/input/input_map.cpp @@ -694,7 +694,7 @@ void InputMap::load_default() { // For the editor, only add keyboard actions. if (iek.is_valid()) { - action_add_event(fullname, I->get()); + action_add_event(name, I->get()); } } } diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index a79c633502..682584d73f 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -1578,11 +1578,11 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) { if (k->is_pressed()) { bool handled = false; - if (k->is_action("ui_pageup") && vscroll->is_visible_in_tree()) { + if (k->is_action("ui_page_up") && vscroll->is_visible_in_tree()) { vscroll->set_value(vscroll->get_value() - vscroll->get_page()); handled = true; } - if (k->is_action("ui_pagedown") && vscroll->is_visible_in_tree()) { + if (k->is_action("ui_page_down") && vscroll->is_visible_in_tree()) { vscroll->set_value(vscroll->get_value() + vscroll->get_page()); handled = true; } |