diff options
| author | Juan Linietsky | 2018-06-18 22:10:48 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2018-06-18 22:12:08 -0300 |
| commit | 0a1c1c660fc6aa0689816e85f2b6791c225c6d63 (patch) | |
| tree | 3907bed5d82fec145f771c713999418bd96ab5ef /scene/gui/progress_bar.cpp | |
| parent | 5c5aafabecfeaa056cae4c3a7fbaa1c52f147930 (diff) | |
| download | godot-0a1c1c660fc6aa0689816e85f2b6791c225c6d63.tar.gz godot-0a1c1c660fc6aa0689816e85f2b6791c225c6d63.tar.zst godot-0a1c1c660fc6aa0689816e85f2b6791c225c6d63.zip | |
-Added AnimationGraphPlayer (still missing features)
-Added ability to edit resources from built-in inspector (wip, needs testing and feedback)
Diffstat (limited to 'scene/gui/progress_bar.cpp')
| -rw-r--r-- | scene/gui/progress_bar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/gui/progress_bar.cpp b/scene/gui/progress_bar.cpp index 37e519e37..fc5d56237 100644 --- a/scene/gui/progress_bar.cpp +++ b/scene/gui/progress_bar.cpp @@ -39,9 +39,9 @@ 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) { - minimum_size.height = MAX(minimum_size.height, bg->get_minimum_size().height + font->get_height()); - } + //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()); + //} return minimum_size; } |