[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

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

New commits:
commit d40d756f4079a228035b5db346da50fe7aed0bd2
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

diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index e007a31..a167c69 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -1016,11 +1016,13 @@ const Link<SystemWindow&,void>& 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();
 }