summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-12-03 11:36:42 +0000
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-12-16 20:30:45 +0000
commitf307d1a01a4eeb3e4c9ee207aa0385c8c4586806 (patch)
tree2f373532ab100084430fab063b9a35c31cbb5a13 /vcl
parent0489922093317cf55a5e12c0e4718d0c8ad7ac1a (diff)
Resolves: tdf#95700 index dialog cut off
queue_resize needs to invalidate the size cache even if there is a pending layout idle awaiting Change-Id: I6dba3d37fbb33125cc3f5d17aff6d2f7a3388654 (cherry picked from commit d40d756f4079a228035b5db346da50fe7aed0bd2) (cherry picked from commit c3a4bfcb0b6191665e63440b99fbf57080bd5c56) Reviewed-on: https://gerrit.libreoffice.org/20374 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/syswin.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index dcb455dbb8a2..9399ffdde01c 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -1004,11 +1004,13 @@ const Link<>& SystemWindow::GetCloseHdl() const
void SystemWindow::queue_resize(StateChangedType /*eReason*/)
{
- if (hasPendingLayout() || isCalculatingInitialLayoutSize())
- return;
if (!isLayoutEnabled())
return;
+ if (isCalculatingInitialLayoutSize())
+ return;
InvalidateSizeCache();
+ if (hasPendingLayout())
+ return;
maLayoutIdle.Start();
}