diff options
| author | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2019-02-27 15:56:49 +0200 |
|---|---|---|
| committer | Bojidar Marinov <bojidar.marinov.bg@gmail.com> | 2019-02-27 15:56:49 +0200 |
| commit | a7b564db6e3f6e0f761e65671d3452e59f428898 (patch) | |
| tree | 34ebadc8e3e49b1dbe3376741f4975c82b43dc5d /scene/gui/progress_bar.cpp | |
| parent | 22ee7ba4f083fdfab1c177fcd8d921736b5a91ca (diff) | |
Fix minimum size of ProgressBar-s
Was a leftover from 0a1c1c660fc6aa0689816e85f2b6791c225c6d63.
Fixes #21633.
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 2195ec9778..264eda4035 100644 --- a/scene/gui/progress_bar.cpp +++ b/scene/gui/progress_bar.cpp @@ -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; } |