[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Caolán McNamara]

 vcl/source/window/syswin.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f307d1a01a4eeb3e4c9ee207aa0385c8c4586806
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 3 11:36:42 2015 +0000

    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 at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index dcb455d..9399ffd 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();
 }