summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPoommetee Ketson <poommetee@protonmail.com>2017-07-29 17:38:16 +0700
committerPoommetee Ketson <poommetee@protonmail.com>2017-07-29 17:38:16 +0700
commit93f017773758c3ed74dd7ec3346e82477f85e32b (patch)
tree8b34e2d4f3d03ba913c894e3b2af2e87ab56e45e
parentb276d92c8a63887df011032bc95d98bbb9c51c70 (diff)
PropertyEditor: Fix easing_curve blocking popup input
-rw-r--r--editor/property_editor.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp
index 71afa8ac79..febaa0e040 100644
--- a/editor/property_editor.cpp
+++ b/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");