vcl/source/window/paint.cxx | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
New commits:
commit a876de01dedb50bbdfb38838b55cae65c07c72a1
Author: Michael Meeks <michael.me...@collabora.com>
AuthorDate: Fri Apr 26 20:04:00 2019 +0100
Commit: Michael Meeks <michael.me...@collabora.com>
CommitDate: Wed May 1 19:19:06 2019 +0200
lok: disable VCL painting and whole window invalidation.
The reasoning is somewhat complex:
void Window::ImplInvalidateFrameRegion( const vcl::Region* pRegion,
InvalidateFlags nFlags )
sets the mnPaintFlags on the mpWindowImpl - and then queues an idle
paint. This paint in LOK mode does ~nothing - since all rendering is
tiled, although amazingly it does emit eg. selection callbacks.
However the paint flag - changes the behavior of Window::Update() to
force a complete window invalidate. This happens, but only rarely -
when a key-event manages to get into the mainloop before the idle
paint handler arrives and does nothing (except clear the paint flags).
So - don't do these big invalidations we don't need to in lok mode,
unless it is for dialogs - which presumably Pranav wanted fixed by
625087b58f3b7.
Change-Id: I88dda34b8d8bba9c89296d883ad9169fe49a7c5e
Reviewed-on: https://gerrit.libreoffice.org/71395
Tested-by: Jenkins
Reviewed-by: Michael Meeks <michael.me...@collabora.com>
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 46b56b330602..7f6e8124c0d1 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -33,6 +33,7 @@
#include <salframe.hxx>
#include <svdata.hxx>
#include <comphelper/lok.hxx>
+#include <comphelper/profilezone.hxx>
#if HAVE_FEATURE_OPENGL
#include <vcl/opengl/OpenGLHelper.hxx>
#endif
@@ -631,6 +632,8 @@ void Window::ImplCallOverlapPaint()
IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
{
+ comphelper::ProfileZone aZone("VCL idle re-paint");
+
// save paint events until layout is done
if (IsSystemWindow() && static_cast<const
SystemWindow*>(this)->hasPendingLayout())
{
@@ -652,6 +655,8 @@ IMPL_LINK_NOARG(Window, ImplHandlePaintHdl, Timer *, void)
IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl, Timer *, void)
{
+ comphelper::ProfileZone aZone("VCL idle resize");
+
if( mpWindowImpl->mbReallyVisible )
{
ImplCallResize();
@@ -719,6 +724,7 @@ void Window::ImplInvalidateFrameRegion( const vcl::Region*
pRegion, InvalidateFl
pParent->ImplInvalidateFrameRegion( pChildRegion, nFlags );
}
}
+
if ( !mpWindowImpl->mpFrameData->maPaintIdle.IsActive() )
mpWindowImpl->mpFrameData->maPaintIdle.Start();
}
@@ -1321,10 +1327,13 @@ void Window::Update()
}
pUpdateWindow->ImplCallPaint(nullptr,
pUpdateWindow->mpWindowImpl->mnPaintFlags);
- pUpdateWindow->LogicInvalidate(nullptr);
+
+ if (comphelper::LibreOfficeKit::isActive() &&
pUpdateWindow->GetParentDialog())
+ pUpdateWindow->LogicInvalidate(nullptr);
if (xWindow->IsDisposed())
return;
+
bFlush = true;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
