[Libreoffice-commits] core.git: vcl/source

[Gülşah Köse (via logerrit)]

 vcl/source/window/layout.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f61fcf6fe6b9f54dd57ca5d868b1b0436e9cec61
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Tue May 4 13:21:07 2021 +0300
Commit:     Gülşah Köse <gulsah.kose at collabora.com>
CommitDate: Wed May 5 17:11:52 2021 +0200

    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 at redhat.com>
    Reviewed-by: Gülşah Köse <gulsah.kose at collabora.com>

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 0a79fb7f78dc..0ef015140b93 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;