commi

Author: HomuHomu833

project/lib/sdl/src/video/android/SDL_androidmouse.c

@@ -29,6 +29,8 @@
 
 #include "../../core/android/SDL_android.h"
 
+#include "SDL_androidvideo.h"
+
 // See Android's MotionEvent class for constants
 #define ACTION_DOWN       0
 #define ACTION_UP         1
@@ -216,6 +218,19 @@ void Android_OnMouse(SDL_Window *window, int state, int action, float x, float y
         return;
     }
 
+    // The draw scale shrinks the window/framebuffer (see SDL_androidwindow.c), but
+    // mouse coordinates arrive in full-surface View pixels. Scale absolute positions
+    // into the same space so the pointer matches what's rendered. Relative-mode deltas
+    // are already in motion units, and ACTION_SCROLL reuses x/y as wheel amounts; neither
+    // must be scaled.
+    if (!relative && action != ACTION_SCROLL) {
+        float scale = Android_GetDrawScale();
+        if (Android_ShouldUseDrawScale(scale)) {
+            x *= scale;
+            y *= scale;
+        }
+    }
+
     switch (action) {
     case ACTION_DOWN:
         changes = state & ~last_state;

project/lib/sdl/src/video/android/SDL_androidpen.c

@@ -25,6 +25,7 @@
 #include "SDL_androidpen.h"
 #include "../../events/SDL_pen_c.h"
 #include "../../core/android/SDL_android.h"
+#include "SDL_androidvideo.h"
 
 #define ACTION_DOWN   0
 #define ACTION_UP     1
@@ -40,6 +41,15 @@ void Android_OnPen(SDL_Window *window, int pen_id_in, SDL_PenDeviceType device_t
         return;
     }
 
+    // The draw scale shrinks the window/framebuffer (see SDL_androidwindow.c), but pen
+    // coordinates arrive in full-surface View pixels. Scale them into the same space so
+    // the pointer matches what's rendered.
+    float scale = Android_GetDrawScale();
+    if (Android_ShouldUseDrawScale(scale)) {
+        x *= scale;
+        y *= scale;
+    }
+
     // pointer index starts from zero.
     pen_id_in++;