asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #90852 from timothyqiu/padding-always

Browse source 
Fix buttons offset to the right when dialog is at minsize
This commit is contained in:
Rémi Verschelde 2024-04-19 16:27:56 +02:00
commit a523532d18
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scene/gui/dialogs.cpp
View file

@ -264,12 +264,6 @@ Size2 AcceptDialog::_get_contents_minimum_size() const {
content_minsize = child_minsize.max(content_minsize); 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 // Then we add buttons. Horizontally we're interested in whichever
// value is the biggest. Vertically buttons add to the overall size. // value is the biggest. Vertically buttons add to the overall size.
Size2 buttons_minsize = buttons_hbox->get_combined_minimum_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. // Plus there is a separation size added on top.
content_minsize.y += theme_cache.buttons_separation; 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; return content_minsize;
} }