commit 95a1ccff3a252315e1c2499331ded4bc2e660d54
author Gülşah Köse <gulsah.kose@collabora.com> Mon May 10 01:15:40 2021 +0300
committer Gülşah Köse <gulsah.kose@collabora.com> Wed May 12 11:18:49 2021 +0200
tree 9a311da554f90efb1f4fcb80a26fe7f2b6d348be
parent addb261c7a93f16b3be84d1e67994cecdb53de77

tdf#141426 Fix VclBox inital size allocation.

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

sfx2/uiconfig/ui/developmenttool.ui

diff --git a/sfx2/uiconfig/ui/developmenttool.ui b/sfx2/uiconfig/ui/developmenttool.ui
index 20f0c2e..826cf30 100644
--- a/sfx2/uiconfig/ui/developmenttool.ui
+++ b/sfx2/uiconfig/ui/developmenttool.ui
@@ -589,7 +589,7 @@
                    </child>
                  </object>
                  <packing>
                    <property name="resize">False</property>
                    <property name="resize">True</property>
                    <property name="shrink">True</property>
                  </packing>
                </child>

vcl/source/window/layout.cxx

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 7ee7665..79a843e 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -327,7 +327,7 @@ void VclBox::setAllocation(const Size &rAllocation)
            if (bFill)
            {
                setPrimaryDimension(aChildSize, std::max(static_cast<tools::Long>(1),
                    getPrimaryDimension(aBoxSize) - nPadding * 2));
                    std::min(getPrimaryDimension(rAllocation), getPrimaryDimension(aBoxSize) - nPadding * 2)));

                setPrimaryCoordinate(aChildPos, nPrimaryCoordinate + nPadding);
            }