diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-11-15 14:49:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-17 20:10:50 +0000 |
| commit | d00ee312b2b499da11752f89d8791e562c7f70b9 (patch) | |
| tree | dcb3d4b3a122ab9bd09e93a8bbcd7bb0bba73e2c /vcl/source/window | |
| parent | 77d6f58dddcc9aba0c9262c9ebb62f56e2845838 (diff) | |
honour widget [v|h]expand in VclBox as well as packing expand
Change-Id: I5ccd28c8d9d62d5a7bec118312752f66a9a4d609
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/layout.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index be6cbe4b9003..4e7b098c329c 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -130,7 +130,7 @@ void VclBox::setAllocation(const Size &rAllocation) if (!pChild->IsVisible()) continue; ++nVisibleChildren; - bool bExpand = pChild->get_expand(); + bool bExpand = getPrimaryDimensionChildExpand(*pChild); if (bExpand) ++nExpandChildren; } @@ -181,7 +181,7 @@ void VclBox::setAllocation(const Size &rAllocation) aBoxSize = getLayoutRequisition(*pChild); long nPrimaryDimension = getPrimaryDimension(aBoxSize); nPrimaryDimension += nPadding * 2; - if (pChild->get_expand()) + if (getPrimaryDimensionChildExpand(*pChild)) nPrimaryDimension += nExtraSpace; setPrimaryDimension(aBoxSize, nPrimaryDimension); } |