diff options
author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2019-09-20 18:51:27 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2019-10-07 12:48:20 +0200 |
commit | 86c180a1193e928385bd8344d7dc7be1bf828cf1 (patch) | |
tree | d145509ab7f3f758731f71ce17abe51b116cde9b | |
parent | 111c260ab2883b7906f1a66e222dbf4dc3c58c4f (diff) |
lok: comments: fix hidden text cursor and sudden document scroll
On Android, SwAnnotationWin::Rescale leads to invoke
ImpEditEngine::UpdateViews which hides the text cursor. Moreover it
causes sudden document scroll when modifying a commented text.
Not clear the root cause, anyway skipping this method fixes the
problem, and there should be no side effect, since the client has
disabled annotations rendering.
Change-Id: I572a9c6b3fe39473a596209413945d777bd79506
Reviewed-on: https://gerrit.libreoffice.org/80244
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r-- | sw/source/uibase/docvw/AnnotationWin2.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index acfc90b506e0..e73592f947b9 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -626,6 +626,14 @@ void SwAnnotationWin::CheckMetaText() void SwAnnotationWin::Rescale() { + // On Android, this method leads to invoke ImpEditEngine::UpdateViews + // which hides the text cursor. Moreover it causes sudden document scroll + // when modifying a commented text. Not clear the root cause, + // anyway skipping this method fixes the problem, and there should be + // no side effect, since the client has disabled annotations rendering. + if (comphelper::LibreOfficeKit::isActive() && !comphelper::LibreOfficeKit::isTiledAnnotations()) + return; + MapMode aMode = GetParent()->GetMapMode(); aMode.SetOrigin( Point() ); mpOutliner->SetRefMapMode( aMode ); |