summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorBartlomiej Moskal <bartlomiej.moskal@qt.io>2021-03-18 07:54:20 +0100
committerBartlomiej Moskal <bartlomiej.moskal@qt.io>2021-03-26 08:05:13 +0000
commit547228bf86281733c09a0638c57a4384c664f66e (patch)
tree6ef0107c19391372ea5b4c5ad825e854497c2028 /src/android
parente402e1103b874c0bf91a1bc754752ee73ffadf33 (diff)
Android: fix wrong position of cursor hander in split screen
Use activity window position to fix position of cursor hander. In case without splti sceen, position of activity window is equal (0, 0), so it does not have any effect. Fixes: QTBUG-91362 Pick-to: 5.15 Change-Id: Icae9f19308112a78bdddf168abe81ffe7b6e4fae Reviewed-by: Rami Potinkara <rami.potinkara@qt.io> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/CursorHandle.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java b/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java
index fd650a149c..dbadf7502d 100644
--- a/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java
+++ b/src/android/jar/src/org/qtproject/qt/android/CursorHandle.java
@@ -159,11 +159,15 @@ public class CursorHandle implements ViewTreeObserver.OnPreDrawListener
public void setPosition(final int x, final int y){
initOverlay();
- final int[] location = new int[2];
- m_layout.getLocationOnScreen(location);
+ final int[] layoutLocation = new int[2];
+ m_layout.getLocationOnScreen(layoutLocation);
+
+ // This value is used for handling split screen case
+ final int[] activityLocation = new int[2];
+ m_activity.getWindow().getDecorView().getLocationOnScreen(activityLocation);
- int x2 = x + location[0];
- int y2 = y + location[1] + m_yShift;
+ int x2 = x + layoutLocation[0] - activityLocation[0];
+ int y2 = y + layoutLocation[1] + m_yShift - activityLocation[1];
if (m_id == QtNative.IdCursorHandle) {
x2 -= m_popup.getWidth() / 2 ;