diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-10-08 15:40:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-10-08 15:41:42 +0100 |
| commit | f52f89dc65c3b54215c094e7e93bf239b0a1ba13 (patch) | |
| tree | d5dbea9234be9df77026262aeda816bdca604b1d | |
| parent | b790199b1d393eca11b803db9f9796341a0e58a5 (diff) | |
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
| -rw-r--r-- | vcl/source/window/builder.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/window/layout.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
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); } } |