From 70e5a77794f936d5dd56e8a284c574052b3bad26 Mon Sep 17 00:00:00 2001 From: FrHun <28605587+frhun@users.noreply.github.com> Date: Thu, 23 Sep 2021 15:27:26 +0200 Subject: [PATCH] LibGUI: Consider content_margins for BoxLayout --- Userland/Libraries/LibGUI/BoxLayout.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Userland/Libraries/LibGUI/BoxLayout.cpp b/Userland/Libraries/LibGUI/BoxLayout.cpp index c75c0e30c8..d483fcf965 100644 --- a/Userland/Libraries/LibGUI/BoxLayout.cpp +++ b/Userland/Libraries/LibGUI/BoxLayout.cpp @@ -33,6 +33,7 @@ Gfx::IntSize BoxLayout::preferred_size() const int BoxLayout::preferred_primary_size() const { + auto widget = verify_cast(parent()); int size = 0; for (auto& entry : m_entries) { @@ -52,10 +53,11 @@ int BoxLayout::preferred_primary_size() const if (size > 0) size -= spacing(); + auto content_margins = widget->content_margins(); if (orientation() == Gfx::Orientation::Horizontal) - size += margins().left() + margins().right(); + size += margins().left() + margins().right() + content_margins.left() + content_margins.right(); else - size += margins().top() + margins().bottom(); + size += margins().top() + margins().bottom() + content_margins.top() + content_margins.bottom(); if (!size) return -1; @@ -64,6 +66,7 @@ int BoxLayout::preferred_primary_size() const int BoxLayout::preferred_secondary_size() const { + auto widget = verify_cast(parent()); int size = 0; for (auto& entry : m_entries) { if (!entry.widget || !entry.widget->is_visible()) @@ -77,10 +80,11 @@ int BoxLayout::preferred_secondary_size() const size = max(min_size, size); } + auto content_margins = widget->content_margins(); if (orientation() == Gfx::Orientation::Horizontal) - size += margins().top() + margins().bottom(); + size += margins().top() + margins().bottom() + content_margins.top() + content_margins.bottom(); else - size += margins().left() + margins().right(); + size += margins().left() + margins().right() + content_margins.left() + content_margins.right(); if (!size) return -1;