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

Merge pull request #83623 from rarysson/label-progressbar-allow-greater

Browse Source 
Make ProgressBar reflect the real value in the percent label when "allow greater" is checked
This commit is contained in:
Yuri Sizov 2023-12-20 15:07:30 +01:00
commit 3a44484ab8
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scene/gui/progress_bar.cpp
View File

@ -91,12 +91,32 @@ void ProgressBar::_notification(int p_what) {
}
if (show_percentage) {
String txt = itos(int(get_as_ratio() * 100));
double ratio = 0;
// Avoid division by zero.
if (Math::is_equal_approx(get_max(), get_min())) {
ratio = 1;
} else if (is_ratio_exp() && get_min() >= 0 && get_value() >= 0) {
double exp_min = get_min() == 0 ? 0.0 : Math::log(get_min()) / Math::log((double)2);
double exp_max = Math::log(get_max()) / Math::log((double)2);
double exp_value = get_value() == 0 ? 0.0 : Math::log(get_value()) / Math::log((double)2);
double percentage = (exp_value - exp_min) / (exp_max - exp_min);
ratio = CLAMP(percentage, is_lesser_allowed() ? percentage : 0, is_greater_allowed() ? percentage : 1);
} else {
double percentage = (get_value() - get_min()) / (get_max() - get_min());
ratio = CLAMP(percentage, is_lesser_allowed() ? percentage : 0, is_greater_allowed() ? percentage : 1);
}
String txt = itos(int(ratio * 100));
if (is_localizing_numeral_system()) {
txt = TS->format_number(txt) + TS->percent_sign();
} else {
txt += String("%");
}
TextLine tl = TextLine(txt, theme_cache.font, theme_cache.font_size);
Vector2 text_pos = (Point2(get_size().width - tl.get_size().x, get_size().height - tl.get_size().y) / 2).round();