diff options
| author | Bojidar Marinov | 2018-03-28 20:52:55 +0300 |
|---|---|---|
| committer | Bojidar Marinov | 2018-03-28 20:56:09 +0300 |
| commit | 91eb80041d588ef22926422ae2fc39f375e11aec (patch) | |
| tree | 2035c3e84f7db5734629f87b251cddcddba92614 /scene/gui/progress_bar.cpp | |
| parent | 4b4ed9b72454dea13bd5f0935806519e67f13fbc (diff) | |
| download | godot-91eb80041d588ef22926422ae2fc39f375e11aec.tar.gz godot-91eb80041d588ef22926422ae2fc39f375e11aec.tar.zst godot-91eb80041d588ef22926422ae2fc39f375e11aec.zip | |
Diffstat (limited to 'scene/gui/progress_bar.cpp')
| -rw-r--r-- | scene/gui/progress_bar.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scene/gui/progress_bar.cpp b/scene/gui/progress_bar.cpp index c85bed045..37e519e37 100644 --- a/scene/gui/progress_bar.cpp +++ b/scene/gui/progress_bar.cpp @@ -33,13 +33,16 @@ Size2 ProgressBar::get_minimum_size() const { Ref<StyleBox> bg = get_stylebox("bg"); + Ref<StyleBox> fg = get_stylebox("fg"); Ref<Font> font = get_font("font"); - Size2 ms = bg->get_minimum_size() + bg->get_center_size(); + 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) { - ms.height = MAX(ms.height, bg->get_minimum_size().height + font->get_height()); + minimum_size.height = MAX(minimum_size.height, bg->get_minimum_size().height + font->get_height()); } - return ms; + return minimum_size; } void ProgressBar::_notification(int p_what) { |
