From f52f89dc65c3b54215c094e7e93bf239b0a1ba13 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 8 Oct 2012 15:40:49 +0100 Subject: mark layout as clean before setting allocation so that if setting the allocation makes the control change its mind the dirty flag won't be unset in this iteration, and will trigger a second one Change-Id: Ia4bb37848495bc6115eb8b16ec7a390cd58bd84f --- vcl/source/window/builder.cxx | 2 +- vcl/source/window/layout.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 80daaab2c214..97426b549853 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -730,7 +730,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri { pWindow->SetHelpId(m_sHelpRoot + id); SAL_INFO("vcl.layout", "for " << name.getStr() << - ", created << " << pWindow << " child of " << + ", created " << pWindow << " child of " << pParent << "(" << pWindow->mpWindowImpl->mpParent << "/" << pWindow->mpWindowImpl->mpRealParent << "/" << pWindow->mpWindowImpl->mpBorderWindow << ") with helpid " << diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index debfcfbc9e28..8f05785fd929 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -54,8 +54,8 @@ void VclContainer::SetPosSizePixel(const Point& rAllocPos, const Size& rAllocati Window::SetPosSizePixel(rAllocPos, rAllocation); if (m_bLayoutDirty || bSizeChanged) { - setAllocation(rAllocation); m_bLayoutDirty = false; + setAllocation(rAllocation); } } @@ -81,8 +81,8 @@ void VclContainer::SetSizePixel(const Size& rAllocation) Window::SetSizePixel(aAllocation); if (m_bLayoutDirty || bSizeChanged) { - setAllocation(aAllocation); m_bLayoutDirty = false; + setAllocation(aAllocation); } } -- cgit v1.2.3