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

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

 sfx2/uiconfig/ui/developmenttool.ui |    2 +-
 vcl/source/window/layout.cxx        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 95a1ccff3a252315e1c2499331ded4bc2e660d54
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Mon May 10 01:15:40 2021 +0300
Commit:     Gülşah Köse <gulsah.kose at collabora.com>
CommitDate: Wed May 12 11:18:49 2021 +0200

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

diff --git a/sfx2/uiconfig/ui/developmenttool.ui b/sfx2/uiconfig/ui/developmenttool.ui
index 20f0c2e7d33d..826cf30a2fd8 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>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 7ee7665e0b8e..79a843e5d30d 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);
             }