diff options
| -rw-r--r-- | sfx2/uiconfig/ui/developmenttool.ui | 2 | ||||
| -rw-r--r-- | vcl/source/window/layout.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
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); } |