Prechádzať zdrojové kódy

Merge pull request #90852 from timothyqiu/padding-always

Fix buttons offset to the right when dialog is at minsize
Rémi Verschelde 1 rok pred
rodič
commit
a523532d18
1 zmenil súbory, kde vykonal 6 pridanie a 6 odobranie
  1. 6 6
      scene/gui/dialogs.cpp

+ 6 - 6
scene/gui/dialogs.cpp

@@ -264,12 +264,6 @@ Size2 AcceptDialog::_get_contents_minimum_size() const {
 		content_minsize = child_minsize.max(content_minsize);
 	}
 
-	// Then we take the background panel as it provides the offsets,
-	// which are always added to the minimum size.
-	if (theme_cache.panel_style.is_valid()) {
-		content_minsize += theme_cache.panel_style->get_minimum_size();
-	}
-
 	// Then we add buttons. Horizontally we're interested in whichever
 	// value is the biggest. Vertically buttons add to the overall size.
 	Size2 buttons_minsize = buttons_hbox->get_combined_minimum_size();
@@ -278,6 +272,12 @@ Size2 AcceptDialog::_get_contents_minimum_size() const {
 	// Plus there is a separation size added on top.
 	content_minsize.y += theme_cache.buttons_separation;
 
+	// Then we take the background panel as it provides the offsets,
+	// which are always added to the minimum size.
+	if (theme_cache.panel_style.is_valid()) {
+		content_minsize += theme_cache.panel_style->get_minimum_size();
+	}
+
 	return content_minsize;
 }