1
0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00

Fix enum values in the editor and hide enum numeric values in the Inspector

- Hide numeric value of enum constants in the inspector (EditorPropertyEnum)
- EditorPropertyEnum, CustomPropertyEditor: Calculate values of enum constants correctly when only some of these constants have explicit values.
This commit is contained in:
Ignacio Etcheverry
2018-10-09 16:10:22 +02:00
parent e6cfaa18ca
commit 57f46f7fcd
2 changed files with 19 additions and 27 deletions

View File

@@ -132,7 +132,7 @@ void CustomPropertyEditor::_menu_option(int p_which) {
emit_signal("variant_changed");
} else if (hint == PROPERTY_HINT_ENUM) {
v = p_which;
v = menu->get_item_metadata(p_which);
emit_signal("variant_changed");
}
} break;
@@ -427,12 +427,14 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
} else if (hint == PROPERTY_HINT_ENUM) {
Vector<String> options = hint_text.split(",");
int current_val = 0;
for (int i = 0; i < options.size(); i++) {
if (options[i].find(":") != -1) {
menu->add_item(options[i].get_slicec(':', 0), options[i].get_slicec(':', 1).to_int());
} else {
menu->add_item(options[i], i);
}
Vector<String> text_split = options[i].split(":");
if (text_split.size() != 1)
current_val = text_split[1].to_int();
menu->add_item(text_split[0]);
menu->set_item_metadata(i, current_val);
current_val += 1;
}
menu->set_position(get_position());
menu->popup();