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

[Editor] Merge duplicate entries in enum property inspector 

This helps with confusion over how selecting a key with a duplicate
value won't be selected as only the first entry with a particular value will
be selected.
This commit is contained in:
A Thousand Ships 2024-08-31 15:28:39 +02:00
parent 83d54ab2ad
commit 7d8684fdb5
No known key found for this signature in database
GPG Key ID: 2033189A662F8BD7
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/editor_properties.cpp
View File

@ -687,16 +687,21 @@ void EditorPropertyEnum::update_property() {
void EditorPropertyEnum::setup(const Vector<String> &p_options) { void EditorPropertyEnum::setup(const Vector<String> &p_options) {
options->clear(); options->clear();
HashMap<int64_t, Vector<String>> items;
int64_t current_val = 0; int64_t current_val = 0;
for (int i = 0; i < p_options.size(); i++) { for (const String &option : p_options) {
Vector<String> text_split = p_options[i].split(":"); Vector<String> text_split = option.split(":");
if (text_split.size() != 1) { if (text_split.size() != 1) {
current_val = text_split[1].to_int(); current_val = text_split[1].to_int();
} }
options->add_item(text_split[0]); items[current_val].push_back(text_split[0]);
options->set_item_metadata(i, current_val);
current_val += 1; current_val += 1;
} }
for (const KeyValue<int64_t, Vector<String>> &K : items) {
options->add_item(String(", ").join(K.value));
options->set_item_metadata(-1, K.key);
}
} }
void EditorPropertyEnum::set_option_button_clip(bool p_enable) { void EditorPropertyEnum::set_option_button_clip(bool p_enable) {