2
0
Эх сурвалжийг харах

Merge pull request #60867 from KoBeWi/μtext

Remove font height restriction from Button
Rémi Verschelde 3 жил өмнө
parent
commit
3ad751f7e0
1 өөрчлөгдсөн 5 нэмэгдсэн , 5 устгасан
  1. 5 5
      scene/gui/button.cpp

+ 5 - 5
scene/gui/button.cpp

@@ -60,11 +60,11 @@ Size2 Button::get_minimum_size() const {
 			}
 		}
 	}
-
-	Ref<Font> font = get_theme_font(SNAME("font"));
-	float font_height = font->get_height(get_theme_font_size(SNAME("font_size")));
-
-	minsize.height = MAX(font_height, minsize.height);
+	if (!xl_text.is_empty()) {
+		Ref<Font> font = get_theme_font(SNAME("font"));
+		float font_height = font->get_height(get_theme_font_size(SNAME("font_size")));
+		minsize.height = MAX(font_height, minsize.height);
+	}
 
 	return get_theme_stylebox(SNAME("normal"))->get_minimum_size() + minsize;
 }