summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-01-27 10:59:54 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-02-09 08:09:24 +0100
commitb83b96c41c1a7102db0c80e10f737d906e2cc45d (patch)
tree956fd2511d55caedb9187f198d6d75112026f8f3 /sw
parent2c27ad343d20008d335bde0bce3beda779bd552c (diff)
SwVisCrsr::Show: ignore VisArea() in case of tiled rendering
Which means that then we get the cursor update instantly and can again ignore all events generated by the client's paintTile() call. Change-Id: Ie22e20737c30bdd65d25bc6a84f59df4159b7dec
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/crsr/viscrs.cxx2
-rw-r--r--sw/source/core/view/viewsh.cxx4
2 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index b9f805d7ded4..bb8f6d6571e4 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -88,7 +88,7 @@ void SwVisCrsr::Show()
m_bIsVisible = true;
// display at all?
- if( m_pCrsrShell->VisArea().IsOver( m_pCrsrShell->m_aCharRect ) )
+ if( m_pCrsrShell->VisArea().IsOver( m_pCrsrShell->m_aCharRect ) || m_pCrsrShell->isTiledRendering() )
_SetPosAndShow();
}
}
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 14741cdebcc7..a8934244a919 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -125,9 +125,7 @@ void SwViewShell::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallbac
void SwViewShell::libreOfficeKitCallback(int nType, const char* pPayload) const
{
- if (mbInLibreOfficeKitCallback && nType == LOK_CALLBACK_INVALIDATE_TILES)
- // Make sure no more invalidation events are issued when we're in the
- // callback already.
+ if (mbInLibreOfficeKitCallback)
return;
if (mpLibreOfficeKitCallback)