summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-04-10 17:43:55 +0900
committerTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2015-04-13 19:33:07 +0900
commit98b12bf77f3fa14749df1c8689b97f680aa6af32 (patch)
tree5dfaef5bdd95ae656abca545a669912671d50572
parent0b2a85876c8638dad86feb741003f82b51c231ab (diff)
android: transition first, then move the viewport to the cursor
Change-Id: Iabc9b45dc3198472adda9b6fad1d531c41635f00
-rw-r--r--android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
index 1fdc681e11ca..0c6710396677 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/InvalidationHandler.java
@@ -156,14 +156,14 @@ public class InvalidationHandler implements Document.MessageCallback {
mDocumentOverlay.positionCursor(cursorRectangle);
mDocumentOverlay.positionHandle(SelectionHandle.HandleType.MIDDLE, cursorRectangle);
+ if (mState == OverlayState.TRANSITION || mState == OverlayState.CURSOR) {
+ changeStateTo(OverlayState.CURSOR);
+ }
+
if (mKeyEvent) {
moveViewportToMakeCursorVisible(cursorRectangle);
mKeyEvent = false;
}
-
- if (mState == OverlayState.TRANSITION || mState == OverlayState.CURSOR) {
- changeStateTo(OverlayState.CURSOR);
- }
}
}