Bläddra i källkod

LibGUI: Reuse common parts in ScrollableContainerWidget

No functional changes.
Karol Kosek 3 år sedan
förälder
incheckning
3e4f912479
1 ändrade filer med 6 tillägg och 9 borttagningar
  1. 6 9
      Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp

+ 6 - 9
Userland/Libraries/LibGUI/ScrollableContainerWidget.cpp

@@ -37,25 +37,22 @@ void ScrollableContainerWidget::update_widget_size()
     if (!m_widget)
         return;
     m_widget->do_layout();
+    auto new_size = Widget::content_size();
     if (m_widget->is_shrink_to_fit() && m_widget->layout()) {
-        auto new_size = Widget::content_size();
         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());
-        m_widget->resize(new_size);
-        set_content_size(new_size);
     } else {
-        auto inner_size = Widget::content_size();
         auto min_size = m_widget->min_size();
-        auto new_size = Gfx::Size {
-            max(inner_size.width(), min_size.width()),
-            max(inner_size.height(), min_size.height())
+        new_size = Gfx::Size {
+            max(new_size.width(), min_size.width()),
+            max(new_size.height(), min_size.height())
         };
-        m_widget->resize(new_size);
-        set_content_size(new_size);
     }
+    m_widget->resize(new_size);
+    set_content_size(new_size);
 }
 
 void ScrollableContainerWidget::resize_event(GUI::ResizeEvent& event)