Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make ProgressBar reflect the real value in the percent label when "allow greater" is checked #83623

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Make ProgressBar reflect the real value in the percent label when "allow greater" is checked #83623

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion scene/gui/progress_bar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())) {
rarysson marked this conversation as resolved.
Show resolved Hide resolved
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();

Expand Down
Loading