godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-03 18:11:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

-Added AnimationGraphPlayer (still missing features)

Browse Source 
-Added ability to edit resources from built-in inspector (wip, needs testing and feedback)
This commit is contained in:
Juan Linietsky
2018-06-18 22:10:48 -03:00
parent 5c5aafabec
commit 0a1c1c660f
25 changed files with 4049 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/progress_bar.cpp
View File

@@ -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;
}