godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-01 16:38:31 +00:00
Code Releases Wiki Activity

-Reworked constant nodes better

Browse Source 
-Added simple switch node, removed InputEventFilter
This commit is contained in:
Juan Linietsky
2016-08-31 12:49:45 -03:00
parent 028171845f
commit 5567350e1b
8 changed files with 359 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/editor/property_editor.cpp
View File

@@ -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) {