From 0cce0c2ef878cafe948b8adc31f1ea2903415014 Mon Sep 17 00:00:00 2001
From: Gaurav Ujjwal <gujjwal00@gmail.com>
Date: Wed, 6 Apr 2022 15:05:03 +0530
Subject: [PATCH] Fix click position for mouse back press

---
 app/src/main/java/com/gaurav/avnc/ui/vnc/TouchHandler.kt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/gaurav/avnc/ui/vnc/TouchHandler.kt b/app/src/main/java/com/gaurav/avnc/ui/vnc/TouchHandler.kt
index cad3fe7..06f64e1 100644
--- a/app/src/main/java/com/gaurav/avnc/ui/vnc/TouchHandler.kt
+++ b/app/src/main/java/com/gaurav/avnc/ui/vnc/TouchHandler.kt
@@ -44,7 +44,8 @@ class TouchHandler(private val viewModel: VncViewModel, private val dispatcher:
 
     fun onHoverEvent(event: MotionEvent): Boolean {
         if (event.actionMasked == MotionEvent.ACTION_HOVER_MOVE) {
-            dispatcher.onMouseMove(event.point())
+            lastHoverPoint = event.point()
+            dispatcher.onMouseMove(lastHoverPoint)
             return true
         }
         return false
@@ -58,9 +59,10 @@ class TouchHandler(private val viewModel: VncViewModel, private val dispatcher:
         }
     }
 
+    // Used for back-press interception
+    private var lastHoverPoint = PointF()
     fun onMouseBack() {
-        val p = PointF(viewModel.client.pointerX.toFloat(), viewModel.client.pointerY.toFloat())
-        dispatcher.onMouseBack(p)
+        dispatcher.onMouseBack(lastHoverPoint)
     }
 
     /****************************************************************************************