godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PropertyEditor: Fix easing_curve blocking popup input

Browse Source
This commit is contained in:
Poommetee Ketson 2017-07-29 17:38:16 +07:00
parent b276d92c8a
commit 93f0177737
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/property_editor.cpp
View File

@ -1957,11 +1957,6 @@ CustomPropertyEditor::CustomPropertyEditor() {
add_child(error); add_child(error);
//error->get_cancel()->hide(); //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); scene_tree = memnew(SceneTreeDialog);
add_child(scene_tree); add_child(scene_tree);
scene_tree->connect("selected", this, "_node_path_selected"); 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->emit_signal(SceneStringNames::get_singleton()->input_event,InputEvent());
easing_draw->set_default_cursor_shape(Control::CURSOR_MOVE); 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); menu = memnew(PopupMenu);
add_child(menu); add_child(menu);
menu->connect("id_pressed", this, "_menu_option"); menu->connect("id_pressed", this, "_menu_option");