Mobile: Fixed invalid touch positions

3 files changed, 18 insertions, 1 deletions

diff --git a/src/ui/touch.c b/src/ui/touch.c
index 98dabc39..4bbabece 100644
--- a/src/ui/touch.c
+++ b/src/ui/touch.c
@@ -100,6 +100,7 @@ struct Impl_TouchState {
     iArray *pinches;
     iArray *moms;
     double lastMomTime;
+    iInt2 currentTouchPos; /* for emulating SDL_GetMouseState() */
 };
 
 static iTouchState *touchState_(void) {
@@ -150,6 +151,7 @@ static void clearWidgetMomentum_TouchState_(iTouchState *d, iWidget *widget) {
 }
 
 static void dispatchMotion_Touch_(iFloat3 pos, int buttonState) {
+    touchState_()->currentTouchPos = initF3_I2(pos);
     dispatchEvent_Widget(get_Window()->root, (SDL_Event *) &(SDL_MouseMotionEvent){
         .type = SDL_MOUSEMOTION,
         .timestamp = SDL_GetTicks(),
@@ -162,6 +164,7 @@ static void dispatchMotion_Touch_(iFloat3 pos, int buttonState) {
 
 static iBool dispatchClick_Touch_(const iTouch *d, int button) {
     const iFloat3 tapPos = d->pos[0];
+    touchState_()->currentTouchPos = initF3_I2(tapPos);
     iWindow *window = get_Window();
     SDL_MouseButtonEvent btn = {
         .type = SDL_MOUSEBUTTONDOWN,
@@ -186,6 +189,7 @@ static iBool dispatchClick_Touch_(const iTouch *d, int button) {
 }
 
 static void dispatchButtonDown_Touch_(iFloat3 pos) {
+    touchState_()->currentTouchPos = initF3_I2(pos);
     dispatchEvent_Widget(get_Window()->root, (SDL_Event *) &(SDL_MouseButtonEvent){
         .type = SDL_MOUSEBUTTONDOWN,
         .timestamp = SDL_GetTicks(),
@@ -199,6 +203,7 @@ static void dispatchButtonDown_Touch_(iFloat3 pos) {
 }
 
 static void dispatchButtonUp_Touch_(iFloat3 pos) {
+    touchState_()->currentTouchPos = initF3_I2(pos);
     dispatchEvent_Widget(get_Window()->root, (SDL_Event *) &(SDL_MouseButtonEvent){
         .type = SDL_MOUSEBUTTONUP,
         .timestamp = SDL_GetTicks(),
@@ -694,6 +699,10 @@ void widgetDestroyed_Touch(iWidget *widget) {
     }
 }
 
+iInt2 latestPosition_Touch(void) {
+    return touchState_()->currentTouchPos;
+}
+
 size_t numFingers_Touch(void) {
     return size_Array(touchState_()->touches);
 }
diff --git a/src/ui/touch.h b/src/ui/touch.h
index 19a927ab..3e9c3859 100644
--- a/src/ui/touch.h
+++ b/src/ui/touch.h
@@ -22,7 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #pragma once
 
-#include <the_Foundation/defs.h>
+#include <the_Foundation/vec2.h>
 #include <SDL_events.h>
 
 iDeclareType(Widget)
@@ -31,4 +31,5 @@ iBool   processEvent_Touch      (const SDL_Event *);
 void    update_Touch            (void);
 void    widgetDestroyed_Touch   (iWidget *widget);
 
+iInt2   latestPosition_Touch    (void); /* valid during processing of current event */
 size_t  numFingers_Touch        (void);
diff --git a/src/ui/window.c b/src/ui/window.c
index 05db9a80..cf611e31 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -2110,12 +2110,19 @@ iInt2 coord_Window(const iWindow *d, int x, int y) {
 }
 
 iInt2 mouseCoord_Window(const iWindow *d) {
+#if defined (iPlatformMobile)
+    /* At least on iOS the coordinates returned by SDL_GetMouseState() do no match up with
+       our touch coordinates on the Y axis (?). Maybe a pixel ratio thing? */
+    iUnused(d);
+    return latestPosition_Touch();
+#else
     if (!d->isMouseInside) {
         return init_I2(-1000000, -1000000);
     }
     int x, y;
     SDL_GetMouseState(&x, &y);
     return coord_Window(d, x, y);
+#endif
 }
 
 float uiScale_Window(const iWindow *d) {