浏览代码

Merge pull request #57296 from emcguirk/bug-57253-fix-hint-label

Rémi Verschelde 3 年之前
父节点
当前提交
252ec22ff9
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      editor/plugins/canvas_item_editor_plugin.cpp

+ 5 - 5
editor/plugins/canvas_item_editor_plugin.cpp

@@ -5231,6 +5231,11 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	controls_vb = memnew(VBoxContainer);
 	controls_vb = memnew(VBoxContainer);
 	controls_vb->set_begin(Point2(5, 5));
 	controls_vb->set_begin(Point2(5, 5));
 
 
+	zoom_widget = memnew(EditorZoomWidget);
+	controls_vb->add_child(zoom_widget);
+	zoom_widget->set_anchors_and_offsets_preset(Control::PRESET_TOP_LEFT, Control::PRESET_MODE_MINSIZE, 2 * EDSCALE);
+	zoom_widget->connect("zoom_changed", callable_mp(this, &CanvasItemEditor::_update_zoom));
+
 	panner.instantiate();
 	panner.instantiate();
 	panner->set_callbacks(callable_mp(this, &CanvasItemEditor::_scroll_callback), callable_mp(this, &CanvasItemEditor::_pan_callback), callable_mp(this, &CanvasItemEditor::_zoom_callback));
 	panner->set_callbacks(callable_mp(this, &CanvasItemEditor::_scroll_callback), callable_mp(this, &CanvasItemEditor::_pan_callback), callable_mp(this, &CanvasItemEditor::_zoom_callback));
 
 
@@ -5256,11 +5261,6 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 
 
 	viewport->add_child(controls_vb);
 	viewport->add_child(controls_vb);
 
 
-	zoom_widget = memnew(EditorZoomWidget);
-	controls_vb->add_child(zoom_widget);
-	zoom_widget->set_anchors_and_offsets_preset(Control::PRESET_TOP_LEFT, Control::PRESET_MODE_MINSIZE, 2 * EDSCALE);
-	zoom_widget->connect("zoom_changed", callable_mp(this, &CanvasItemEditor::_update_zoom));
-
 	updating_scroll = false;
 	updating_scroll = false;
 
 
 	// Add some margin to the left for better aesthetics.
 	// Add some margin to the left for better aesthetics.