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

Merge pull request #58346 from aaronfranke/hint-no-range

Browse Source 
Allow using other property hints without the range hint
This commit is contained in:
Rémi Verschelde 2022-04-26 18:44:55 +02:00 committed by GitHub
commit fce210c6e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
editor/editor_properties.cpp
View File

@ -3361,10 +3361,8 @@ struct EditorPropertyRangeHint {
static EditorPropertyRangeHint _parse_range_hint(PropertyHint p_hint, const String &p_hint_text, double p_default_step) { static EditorPropertyRangeHint _parse_range_hint(PropertyHint p_hint, const String &p_hint_text, double p_default_step) {
EditorPropertyRangeHint hint; EditorPropertyRangeHint hint;
hint.step = p_default_step; hint.step = p_default_step;
bool degrees = false; Vector<String> slices = p_hint_text.split(",");
if (p_hint == PROPERTY_HINT_RANGE) { if (p_hint == PROPERTY_HINT_RANGE) {
Vector<String> slices = p_hint_text.split(",");
ERR_FAIL_COND_V_MSG(slices.size() < 2, hint, ERR_FAIL_COND_V_MSG(slices.size() < 2, hint,
vformat("Invalid PROPERTY_HINT_RANGE with hint \"%s\": Missing required min and/or max values.", p_hint_text)); vformat("Invalid PROPERTY_HINT_RANGE with hint \"%s\": Missing required min and/or max values.", p_hint_text));
@ -3381,11 +3379,7 @@ static EditorPropertyRangeHint _parse_range_hint(PropertyHint p_hint, const Stri
hint.hide_slider = false; hint.hide_slider = false;
for (int i = 2; i < slices.size(); i++) { for (int i = 2; i < slices.size(); i++) {
String slice = slices[i].strip_edges(); String slice = slices[i].strip_edges();
if (slice == "radians") { if (slice == "or_greater") {
hint.radians = true;
} else if (slice == "degrees") {
degrees = true;
} else if (slice == "or_greater") {
hint.greater = true; hint.greater = true;
} else if (slice == "or_lesser") { } else if (slice == "or_lesser") {
hint.lesser = true; hint.lesser = true;
@ -3393,11 +3387,20 @@ static EditorPropertyRangeHint _parse_range_hint(PropertyHint p_hint, const Stri
hint.hide_slider = true; hint.hide_slider = true;
} else if (slice == "exp") { } else if (slice == "exp") {
hint.exp_range = true; hint.exp_range = true;
} else if (slice.begins_with("suffix:")) {
hint.suffix = " " + slice.replace_first("suffix:", "").strip_edges();
} }
} }
} }
bool degrees = false;
for (int i = 0; i < slices.size(); i++) {
String slice = slices[i].strip_edges();
if (slice == "radians") {
hint.radians = true;
} else if (slice == "degrees") {
degrees = true;
} else if (slice.begins_with("suffix:")) {
hint.suffix = " " + slice.replace_first("suffix:", "").strip_edges();
}
}
if ((hint.radians || degrees) && hint.suffix.is_empty()) { if ((hint.radians || degrees) && hint.suffix.is_empty()) {
hint.suffix = U"\u00B0"; hint.suffix = U"\u00B0";