diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-08-31 12:49:45 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-08-31 12:50:46 -0300 |
| commit | 5567350e1bf28ca9468b8321378f19e67ee03909 (patch) | |
| tree | 0c8b87498f9fb79a36876435af367c05fb135a4a /tools | |
| parent | 028171845f457d8b7cce6d89d69c5387ff5dbafb (diff) | |
-Reworked constant nodes better
-Added simple switch node, removed InputEventFilter
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/editor/property_editor.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index 380eb247bb..2ea28e26ad 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -91,6 +91,15 @@ void CustomPropertyEditor::_menu_option(int p_which) { } } break; + case Variant::STRING: { + + if (hint==PROPERTY_HINT_ENUM) { + + v=hint_text.get_slice(",",p_which); + emit_signal("variant_changed"); + + } + } break; case Variant::OBJECT: { switch(p_which) { @@ -446,7 +455,16 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty config_action_buttons(names); } else if (hint==PROPERTY_HINT_ENUM) { - + menu->clear(); + Vector<String> options = hint_text.split(","); + for(int i=0;i<options.size();i++) { + menu->add_item(options[i],i); + } + menu->set_pos(get_pos()); + menu->popup(); + hide(); + updating=false; + return false; } else if (hint==PROPERTY_HINT_MULTILINE_TEXT) { |