RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 22:17:45 +00:00
Code Issues Activity Actions

LibGUI: Take only valid sizes when calculating BoxLayout preferred size

Browse source 
We ran a min() function to clamp child widgets to their maximum size,
but if it wasn't set, it got -1 and made the widget able to shrink
completely.
This commit is contained in:
Karol Kosek 2022-05-10 00:11:52 +02:00 • committed by Andreas Kling
parent 84b98da259
commit ea99589d04
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibGUI/BoxLayout.cpp
View file

@ -39,15 +39,17 @@ int BoxLayout::preferred_primary_size() const
for (auto& entry : m_entries) {
if (!entry.widget || !entry.widget->is_visible())
continue;
int min_size = entry.widget->min_size().primary_size_for_orientation(orientation());
int max_size = entry.widget->max_size().primary_size_for_orientation(orientation());
int preferred_primary_size = -1;
if (entry.widget->is_shrink_to_fit() && entry.widget->layout()) {
preferred_primary_size = entry.widget->layout()->preferred_size().primary_size_for_orientation(orientation());
}
int item_size = max(0, preferred_primary_size);
item_size = max(min_size, item_size);
item_size = min(max_size, item_size);
int min_size = entry.widget->min_size().primary_size_for_orientation(orientation());
if (min_size != -1)
item_size = max(min_size, item_size);
int max_size = entry.widget->max_size().primary_size_for_orientation(orientation());
if (max_size != -1)
item_size = min(max_size, item_size);
size += item_size + spacing();
}
if (size > 0)