From afb4dfab22ffd1b87faa9dd596efa832f2475abb Mon Sep 17 00:00:00 2001 From: ordigdug Date: Thu, 12 Jul 2018 15:18:08 -0400 Subject: Fix -new inspector- Inconsistencies with exported enums - Fixes remaining issues in #19534 --- editor/editor_properties.cpp | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 1f45902008..cd0bba4c9c 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -390,13 +390,37 @@ EditorPropertyCheck::EditorPropertyCheck() { void EditorPropertyEnum::_option_selected(int p_which) { - emit_signal("property_changed", get_edited_property(), p_which); + String text = options->get_item_text(p_which); + Vector text_split = text.split(":"); + if (text_split.size() == 1) { + emit_signal("property_changed", get_edited_property(), p_which); + return; + } + String name = text_split[1]; + emit_signal("property_changed", get_edited_property(), name.to_int()); } void EditorPropertyEnum::update_property() { int which = get_edited_object()->get(get_edited_property()); - options->select(which); + if (which == 0) { + options->select(which); + return; + } + + for (int i = 0; i < options->get_item_count(); i++) { + String text = options->get_item_text(i); + Vector text_split = text.split(":"); + if (text_split.size() == 1) { + options->select(which); + return; + } + String name = text_split[1]; + if (itos(which) == name) { + options->select(i); + return; + } + } } void EditorPropertyEnum::setup(const Vector &p_options) { -- cgit v1.2.3