Skip to content

Commit

Permalink
Merge pull request #90852 from timothyqiu/padding-always
Browse files Browse the repository at this point in the history
Fix buttons offset to the right when dialog is at minsize
  • Loading branch information
akien-mga committed Apr 19, 2024
2 parents 81f08c3 + b2d5a06 commit a523532
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions scene/gui/dialogs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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;
}

Expand Down

0 comments on commit a523532

Please sign in to comment.