RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:38:12 +00:00
Code Issues Activity Actions

LibGUI: Try use layout's preferred size for the content size

Browse source 
Previously this was only done if the widget had shrink_to_fit property
enabled.
This commit is contained in:
Karol Kosek 2022-05-07 10:41:11 +02:00 • committed by Andreas Kling
parent 9156614de3
commit f505f1ab5e
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp
View file

@ -38,12 +38,20 @@ void ScrollableContainerWidget::update_widget_size()
return;
m_widget->do_layout();
auto new_size = Widget::content_size();
if (m_widget->is_shrink_to_fit() && m_widget->layout()) {
if (m_widget->layout()) {
auto preferred_size = m_widget->layout()->preferred_size();
if (preferred_size.width() != -1)
new_size.set_width(preferred_size.width());
if (preferred_size.height() != -1)
new_size.set_height(preferred_size.height());
if (m_widget->is_shrink_to_fit()) {
if (preferred_size.width() != -1)
new_size.set_width(preferred_size.width());
if (preferred_size.height() != -1)
new_size.set_height(preferred_size.height());
} else {
new_size = Gfx::Size {
max(new_size.width(), preferred_size.width()),
max(new_size.height(), preferred_size.height())
};
}
}
auto min_size = m_widget->min_size();