[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - vcl/source

[Libreoffice Gerrit user]

 vcl/source/window/window2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e5869e5f5da9c740469cd23bc4c70cc4b7ed3be2
Author:     Pranav Kant <pranavk at collabora.co.uk>
AuthorDate: Tue Jul 17 19:10:48 2018 +0530
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Wed Jul 18 10:38:22 2018 +0200

    lokdialog: no invalidation when in init show
    
    This improves LOK dialog opening time considerably.
    
    libreofficekit/tilebench results:
    
    Before:
    profile run:
      initialization - 346.5185(ms)
      load document - 2162.5881(ms)
      open dialog - 7077.8980(ms)
      wait for dialog - 52.7742(ms)
      render dialog - 256.9597(ms)
      post close dialog - 523.7811(ms)
      destroy document - 58.3723(ms)
    Total: 10.4789(s)
    
    After:
    profile run:
      initialization - 336.5867(ms)
      load document - 2155.5481(ms)
      open dialog - 1151.4130(ms)
      wait for dialog - 51.5332(ms)
      render dialog - 260.3197(ms)
      post close dialog - 519.8729(ms)
      destroy document - 56.7322(ms)
    Total: 4.5320(s)
    
    Change-Id: I6345aca33c5881aba33c8a5f74765b99fe098711
    (cherry picked from commit f57856e9da44a13649b409aaadb9019b916fbb88)
    Reviewed-on: https://gerrit.libreoffice.org/57576
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 4c150b5e0009..3e2ccb380474 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1389,7 +1389,7 @@ void Window::queue_resize(StateChangedType eReason)
 
     if (VclPtr<vcl::Window> pParent = GetParentWithLOKNotifier())
     {
-        if (GetParentDialog())
+        if (!pParent->IsInInitShow())
             LogicInvalidate(nullptr);
     }
 }