Browse Source

Merge pull request #4191 from leezh/progressbar_minsize

Progress bar minsize now checks percent_visible
Rémi Verschelde 9 years ago
parent
commit
72825ecdca
1 changed files with 3 additions and 1 deletions
  1. 3 1
      scene/gui/progress_bar.cpp

+ 3 - 1
scene/gui/progress_bar.cpp

@@ -35,7 +35,9 @@ Size2 ProgressBar::get_minimum_size() const {
 	Ref<Font> font = get_font("font");
 
 	Size2 ms=bg->get_minimum_size()+bg->get_center_size();
-	ms.height=MAX(ms.height,bg->get_minimum_size().height+font->get_height());
+	if (percent_visible) {
+		ms.height=MAX(ms.height,bg->get_minimum_size().height+font->get_height());
+	}
 	return ms;
 }