summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-06-29 18:35:12 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-06-29 18:42:17 +0000
commitbeb4aa21d61f0d66392d596be86fb57b4b167239 (patch)
tree2d61b4d625d5b2cc50f59c4827c6eb259ea5d616
parent39b04ad7cb2e10f32e92d3c9bec57e35f64a3304 (diff)
SwViewShell::ImplEndAction: avoid direct paint
Commit 56dd27d9ed829ea0444b3b5932dcd0d431d6e251 (sw: invalidate after keypresses when we have a callback, 2015-01-13) only enabled invalidate-then-paint for the tiled rendering case, because the main loop had no priorities back then. This limitation went away with 48c2815dd20cf20eeec8bb4e003000f4a3d13291 (tdf#91727 - Unwind non-dispatch of idle handlers., 2015-06-10), so it's not a problem to always do this panting inside the Paint() call. Change-Id: I98ddfcc0f20f1553974b74ec3c859dde315612e4 Reviewed-on: https://gerrit.libreoffice.org/16587 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
-rw-r--r--sw/source/core/view/viewsh.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 7998259308de..a8353735b014 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -410,10 +410,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
if ( bPaintsFromSystem )
PaintDesktop(*GetOut(), aRect);
- if (!isTiledRendering())
- pCurrentLayout->Paint( *mpOut, aRect );
- else
- pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
+ pCurrentLayout->GetCurrShell()->InvalidateWindows(aRect.SVRect());
// #i75172# end DrawingLayer paint
DLPostPaint2(true);