Pārlūkot izejas kodu

Merge pull request #9966 from Noshyaar/pr-fixcurve

PropertyEditor: Fix easing_curve blocking popup input
George Marques 8 gadi atpakaļ
vecāks
revīzija
8bd792d7bb
1 mainītis faili ar 5 papildinājumiem un 5 dzēšanām
  1. 5 5
      editor/property_editor.cpp

+ 5 - 5
editor/property_editor.cpp

@@ -1957,11 +1957,6 @@ CustomPropertyEditor::CustomPropertyEditor() {
 	add_child(error);
 	//error->get_cancel()->hide();
 
-	type_button = memnew(MenuButton);
-	add_child(type_button);
-	type_button->hide();
-	type_button->get_popup()->connect("id_pressed", this, "_type_create_selected");
-
 	scene_tree = memnew(SceneTreeDialog);
 	add_child(scene_tree);
 	scene_tree->connect("selected", this, "_node_path_selected");
@@ -1979,6 +1974,11 @@ CustomPropertyEditor::CustomPropertyEditor() {
 	//easing_draw->emit_signal(SceneStringNames::get_singleton()->input_event,InputEvent());
 	easing_draw->set_default_cursor_shape(Control::CURSOR_MOVE);
 
+	type_button = memnew(MenuButton);
+	add_child(type_button);
+	type_button->hide();
+	type_button->get_popup()->connect("id_pressed", this, "_type_create_selected");
+
 	menu = memnew(PopupMenu);
 	add_child(menu);
 	menu->connect("id_pressed", this, "_menu_option");