浏览代码

Merge pull request #44217 from akien-mga/fix-signals-after-renames

Fix connections to CanvasItem and Tabs signals
Rémi Verschelde 4 年之前
父节点
当前提交
e48d1b3f51
共有 3 个文件被更改,包括 5 次插入5 次删除
  1. 3 3
      editor/editor_node.cpp
  2. 1 1
      editor/editor_node.h
  3. 1 1
      scene/gui/color_picker.cpp

+ 3 - 3
editor/editor_node.cpp

@@ -4708,7 +4708,7 @@ void EditorNode::_scene_tab_closed(int p_tab, int option) {
 	_update_scene_tabs();
 	_update_scene_tabs();
 }
 }
 
 
-void EditorNode::_scene_tab_hover(int p_tab) {
+void EditorNode::_scene_tab_hovered(int p_tab) {
 	if (!bool(EDITOR_GET("interface/scene_tabs/show_thumbnail_on_hover"))) {
 	if (!bool(EDITOR_GET("interface/scene_tabs/show_thumbnail_on_hover"))) {
 		return;
 		return;
 	}
 	}
@@ -5996,8 +5996,8 @@ EditorNode::EditorNode() {
 	scene_tabs->set_drag_to_rearrange_enabled(true);
 	scene_tabs->set_drag_to_rearrange_enabled(true);
 	scene_tabs->connect("tab_changed", callable_mp(this, &EditorNode::_scene_tab_changed));
 	scene_tabs->connect("tab_changed", callable_mp(this, &EditorNode::_scene_tab_changed));
 	scene_tabs->connect("right_button_pressed", callable_mp(this, &EditorNode::_scene_tab_script_edited));
 	scene_tabs->connect("right_button_pressed", callable_mp(this, &EditorNode::_scene_tab_script_edited));
-	scene_tabs->connect("tab_close", callable_mp(this, &EditorNode::_scene_tab_closed), varray(SCENE_TAB_CLOSE));
-	scene_tabs->connect("tab_hover", callable_mp(this, &EditorNode::_scene_tab_hover));
+	scene_tabs->connect("tab_closed", callable_mp(this, &EditorNode::_scene_tab_closed), varray(SCENE_TAB_CLOSE));
+	scene_tabs->connect("tab_hovered", callable_mp(this, &EditorNode::_scene_tab_hovered));
 	scene_tabs->connect("mouse_exited", callable_mp(this, &EditorNode::_scene_tab_exit));
 	scene_tabs->connect("mouse_exited", callable_mp(this, &EditorNode::_scene_tab_exit));
 	scene_tabs->connect("gui_input", callable_mp(this, &EditorNode::_scene_tab_input));
 	scene_tabs->connect("gui_input", callable_mp(this, &EditorNode::_scene_tab_input));
 	scene_tabs->connect("reposition_active_tab_request", callable_mp(this, &EditorNode::_reposition_active_tab));
 	scene_tabs->connect("reposition_active_tab_request", callable_mp(this, &EditorNode::_reposition_active_tab));

+ 1 - 1
editor/editor_node.h

@@ -579,7 +579,7 @@ private:
 	void _dock_make_float();
 	void _dock_make_float();
 	void _scene_tab_changed(int p_tab);
 	void _scene_tab_changed(int p_tab);
 	void _scene_tab_closed(int p_tab, int option = SCENE_TAB_CLOSE);
 	void _scene_tab_closed(int p_tab, int option = SCENE_TAB_CLOSE);
-	void _scene_tab_hover(int p_tab);
+	void _scene_tab_hovered(int p_tab);
 	void _scene_tab_exit();
 	void _scene_tab_exit();
 	void _scene_tab_input(const Ref<InputEvent> &p_input);
 	void _scene_tab_input(const Ref<InputEvent> &p_input);
 	void _reposition_active_tab(int idx_to);
 	void _reposition_active_tab(int idx_to);

+ 1 - 1
scene/gui/color_picker.cpp

@@ -615,7 +615,7 @@ void ColorPicker::_screen_pick_pressed() {
 		screen->set_default_cursor_shape(CURSOR_POINTING_HAND);
 		screen->set_default_cursor_shape(CURSOR_POINTING_HAND);
 		screen->connect("gui_input", callable_mp(this, &ColorPicker::_screen_input));
 		screen->connect("gui_input", callable_mp(this, &ColorPicker::_screen_input));
 		// It immediately toggles off in the first press otherwise.
 		// It immediately toggles off in the first press otherwise.
-		screen->call_deferred("connect", "hide", Callable(btn_pick, "set_pressed"), varray(false));
+		screen->call_deferred("connect", "hidden", Callable(btn_pick, "set_pressed"), varray(false));
 	}
 	}
 	screen->raise();
 	screen->raise();
 #ifndef _MSC_VER
 #ifndef _MSC_VER