commit f61fcf6fe6b9f54dd57ca5d868b1b0436e9cec61
author Gülşah Köse <gulsah.kose@collabora.com> Tue May 04 13:21:07 2021 +0300
committer Gülşah Köse <gulsah.kose@collabora.com> Wed May 05 17:11:52 2021 +0200
tree 121ea0e0088ad29b9329755bd8562094aab18b9a
parent ed12269c42f75f553bb8a8770923406f7824e473

tdf#141424 Include the margin sizes while calculating width of window.

Change-Id: I0863dc62f1ade6cc07835e83eb242f3d5a9906bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115068
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>

vcl/source/window/layout.cxx

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 0a79fb7..0ef0151 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2771,7 +2771,7 @@ void VclHPaned::setAllocation(const Size& rAllocation)
            if (bInitialAllocation)
                nFirstWidth = getLayoutRequisition(*pChild).Width();
            else
                nFirstWidth = pChild->GetSizePixel().Width();
                nFirstWidth = pChild->GetSizePixel().Width() + pChild->get_margin_start() + pChild->get_margin_end();
            bFirstCanResize = pChild->get_expand();
        }
        else if (nElement == 2)
@@ -2779,7 +2779,7 @@ void VclHPaned::setAllocation(const Size& rAllocation)
            if (bInitialAllocation)
                nSecondWidth = getLayoutRequisition(*pChild).Width();
            else
                nSecondWidth = pChild->GetSizePixel().Width();
                nSecondWidth = pChild->GetSizePixel().Width() + pChild->get_margin_start() + pChild->get_margin_end();
            bSecondCanResize = pChild->get_expand();
        }
        ++nElement;