godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-05 06:11:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22885 from neikeq/issue-22122

Browse Source 
Hide numeric value for constants in EditorPropertyEnum
This commit is contained in:
Rémi Verschelde
2018-10-16 15:01:03 +02:00
committed by GitHub
parent 47c0aff491 57f46f7fcd
commit 5d4a073e98
2 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
editor/editor_properties.cpp
View File

@@ -477,33 +477,16 @@ EditorPropertyCheck::EditorPropertyCheck() {
void EditorPropertyEnum::_option_selected(int p_which) {
String text = options->get_item_text(p_which);
Vector<String> 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());
int val = options->get_item_metadata(p_which);
emit_signal("property_changed", get_edited_property(), val);
}
void EditorPropertyEnum::update_property() {
int which = get_edited_object()->get(get_edited_property());
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<String> text_split = text.split(":");
if (text_split.size() == 1) {
options->select(which);
return;
}
String name = text_split[1];
if (itos(which) == name) {
if (which == (int)options->get_item_metadata(i)) {
options->select(i);
return;
}
@@ -511,8 +494,15 @@ void EditorPropertyEnum::update_property() {
}
void EditorPropertyEnum::setup(const Vector<String> &p_options) {
int current_val = 0;
for (int i = 0; i < p_options.size(); i++) {
options->add_item(p_options[i], i);
Vector<String> text_split = p_options[i].split(":");
if (text_split.size() != 1)
current_val = text_split[1].to_int();
options->add_item(text_split[0]);
options->set_item_metadata(i, current_val);
current_val += 1;
}
}