浏览代码

Merge pull request #46371 from EricEzaM/PR/fix-osx-inputmap-spammed-errors

Fixed 'nonexistent action' errors spammed at startup on OSX
Rémi Verschelde 4 年之前
父节点
当前提交
65305ea001
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      core/input/input_map.cpp
  2. 2 2
      scene/gui/rich_text_label.cpp

+ 1 - 1
core/input/input_map.cpp

@@ -694,7 +694,7 @@ void InputMap::load_default() {
 
 
 			// For the editor, only add keyboard actions.
 			// For the editor, only add keyboard actions.
 			if (iek.is_valid()) {
 			if (iek.is_valid()) {
-				action_add_event(fullname, I->get());
+				action_add_event(name, I->get());
 			}
 			}
 		}
 		}
 	}
 	}

+ 2 - 2
scene/gui/rich_text_label.cpp

@@ -1578,11 +1578,11 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) {
 		if (k->is_pressed()) {
 		if (k->is_pressed()) {
 			bool handled = false;
 			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());
 				vscroll->set_value(vscroll->get_value() - vscroll->get_page());
 				handled = true;
 				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());
 				vscroll->set_value(vscroll->get_value() + vscroll->get_page());
 				handled = true;
 				handled = true;
 			}
 			}