vcl/source/control/tabctrl.cxx | 3 ++- vcl/source/window/tabpage.cxx | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
New commits: commit b307085bcbf5e17c1d72171c33a5cc1cffd70f38 Author: Caolán McNamara <[email protected]> Date: Fri Feb 15 12:38:42 2013 +0000 Resolves: fdo#61241 background style dialog too small (cherry picked from commit 1ccbb620946c7032c57054550b08ad5362fe1c3f) Conflicts: vcl/source/control/tabctrl.cxx vcl/source/window/tabpage.cxx Change-Id: Ie7396b63a64e89bb7aa7c0e284faab7ed380c4c1 Reviewed-on: https://gerrit.libreoffice.org/3188 Reviewed-by: Fridrich Strba <[email protected]> Tested-by: Fridrich Strba <[email protected]> diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 4e1afc2..19163f1 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -29,6 +29,7 @@ #include "vcl/tabpage.hxx" #include "vcl/tabctrl.hxx" #include "vcl/controllayout.hxx" +#include "vcl/layout.hxx" #include "vcl/lstbox.hxx" #include "controldata.hxx" @@ -2179,7 +2180,7 @@ Size TabControl::calculateRequisition() const if (!pPage) continue; - Size aPageSize(pPage->GetOptimalSize(WINDOWSIZE_PREFERRED)); + Size aPageSize(VclContainer::getLayoutRequisition(*pPage)); if (aPageSize.Width() > aOptimalPageSize.Width()) aOptimalPageSize.Width() = aPageSize.Width(); diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx index 3546c4f..d3b1f34 100644 --- a/vcl/source/window/tabpage.cxx +++ b/vcl/source/window/tabpage.cxx @@ -222,7 +222,7 @@ Size TabPage::GetOptimalSize(WindowSizeType eType) const return Window::GetOptimalSize(eType); Size aSize; if (isLayoutEnabled()) - aSize = GetWindow(WINDOW_FIRSTCHILD)->GetOptimalSize(eType); + aSize = VclContainer::getLayoutRequisition(*GetWindow(WINDOW_FIRSTCHILD)); else aSize = getLegacyBestSizeForChildren(*this); return Window::CalcWindowSize(aSize);
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
