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

Merge pull request #26352 from bojidar-bg/21633-progress-stylebox

Browse Source 
Fix minimum size of ProgressBar-s
This commit is contained in:
Rémi Verschelde 2019-02-27 17:19:01 +01:00 committed by GitHub
commit ce615c1a82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/plugins/animation_blend_tree_editor_plugin.cpp
View File

@ -231,6 +231,7 @@ void AnimationNodeBlendTreeEditor::_update_graph() {
}
pb->set_percent_visible(false);
pb->set_custom_minimum_size(Vector2(0, 14) * EDSCALE);
animations[E->get()] = pb;
node->add_child(pb);

9
scene/gui/progress_bar.cpp
View File

@ -39,9 +39,12 @@ Size2 ProgressBar::get_minimum_size() const {
Size2 minimum_size = bg->get_minimum_size();
minimum_size.height = MAX(minimum_size.height, fg->get_minimum_size().height);
minimum_size.width = MAX(minimum_size.width, fg->get_minimum_size().width);
//if (percent_visible) { this is needed, else the progressbar will collapse
minimum_size.height = MAX(minimum_size.height, bg->get_minimum_size().height + font->get_height());
//}
if (percent_visible) {
minimum_size.height = MAX(minimum_size.height, bg->get_minimum_size().height + font->get_height());
} else { // this is needed, else the progressbar will collapse
minimum_size.width = MAX(minimum_size.width, 1);
minimum_size.height = MAX(minimum_size.height, 1);
}
return minimum_size;
}