From 50495bcb082738404af3f831cc46fbb443c79b89 Mon Sep 17 00:00:00 2001 From: Aaron Franke Date: Sun, 20 Feb 2022 02:04:58 -0600 Subject: Allow using other property hints without the range hint --- editor/editor_properties.cpp | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) (limited to 'editor') diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index 677d22cb62..581a807e27 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -3361,10 +3361,8 @@ struct EditorPropertyRangeHint { static EditorPropertyRangeHint _parse_range_hint(PropertyHint p_hint, const String &p_hint_text, double p_default_step) { EditorPropertyRangeHint hint; hint.step = p_default_step; - bool degrees = false; - + Vector slices = p_hint_text.split(","); if (p_hint == PROPERTY_HINT_RANGE) { - Vector slices = p_hint_text.split(","); 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)); @@ -3381,11 +3379,7 @@ static EditorPropertyRangeHint _parse_range_hint(PropertyHint p_hint, const Stri hint.hide_slider = false; for (int i = 2; 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 == "or_greater") { + if (slice == "or_greater") { hint.greater = true; } else if (slice == "or_lesser") { hint.lesser = true; @@ -3393,11 +3387,20 @@ static EditorPropertyRangeHint _parse_range_hint(PropertyHint p_hint, const Stri hint.hide_slider = true; } else if (slice == "exp") { 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()) { hint.suffix = U"\u00B0"; -- cgit v1.2.3