summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2021-10-05 14:30:44 +0200
committerLuboš Luňák <l.lunak@collabora.com>2021-10-05 22:02:02 +0200
commit69bd4b2ad4dd81e5f46a8c598e14410baecc732e (patch)
tree1fb40518a6c06caeed73c5d17c32160a339e8c05 /vcl
parent90aa650da26b2359bbf055b8d952fbc60838890f (diff)
do not block out PaintImmediately() in LOK mode
I'm not sure why I did this when disabling LOK idle painting, even if a window is not to be painted to, it still needs at least invalidating. Change-Id: Iaed6b1071d05d05d6bf5195f3803afb1fc018508 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122946 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/paint.cxx9
1 files changed, 2 insertions, 7 deletions
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 8531ead70012..29f34de4f53c 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -594,7 +594,8 @@ void Window::ImplCallPaint(const vcl::Region* pRegion, ImplPaintFlags nPaintFlag
if (!mpWindowImpl->mpFirstChild)
mpWindowImpl->mnPaintFlags &= ~ImplPaintFlags::PaintAllChildren;
- if (mpWindowImpl->mbPaintDisabled)
+ // If tiled rendering is used, windows are only invalidated, never painted to.
+ if (mpWindowImpl->mbPaintDisabled || comphelper::LibreOfficeKit::isActive())
{
if (mpWindowImpl->mnPaintFlags & ImplPaintFlags::PaintAll)
Invalidate(InvalidateFlags::NoChildren | InvalidateFlags::NoErase | InvalidateFlags::NoTransparent | InvalidateFlags::NoClipChildren);
@@ -1316,12 +1317,6 @@ void Window::PaintImmediately()
if (!mpWindowImpl)
return;
- if (comphelper::LibreOfficeKit::isActive())
- {
- // Tiled rendering is used, direct paint does not need to do anything.
- return;
- }
-
if ( mpWindowImpl->mpBorderWindow )
{
mpWindowImpl->mpBorderWindow->PaintImmediately();