I have trust issues

Author: HomuHomu833

project/lib/sdl/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -1342,6 +1342,14 @@ public static boolean sendMessage(int command, int param) {
         return mSingleton.sendCommand(command, param);
     }
 
+    public static boolean isInMultiWindowModeJNI() {
+        if (mSingleton == null || !mHasMultiWindow) {
+            return false;
+        }
+
+        return mSingleton.isInMultiWindowMode();
+    }
+
     /**
      * This method is called by SDL using JNI.
      */

project/lib/sdl/src/video/SDL_video.c

@@ -6037,6 +6037,10 @@ bool SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonID)
 
     SDL_ClearError();
 
+    #if SDL_PLATFORM_IOS
+    SDL_Log("SDL_ShowMessageBox: \"%s\" - \"%s\"", messageboxdata->title, messageboxdata->message);
+    #endif
+
     if (_this && _this->ShowMessageBox) {
         result = _this->ShowMessageBox(_this, messageboxdata, buttonID);
     } else {

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

@@ -199,6 +199,20 @@ void Android_VideoQuit(SDL_VideoDevice *_this)
     Android_QuitTouch();
 }
 
+float Android_GetDrawScale(void)
+{
+    const char *scale_hint = SDL_GetHint("SDL_ANDROID_DRAW_SCALE");
+
+    float scale = scale_hint && !(Android_JNI_IsInMultiWindowMode() || SDL_IsDeXMode() || SDL_IsChromebook()) ? (float)atof(scale_hint) : 1.0;
+
+    return scale < 0.5 ? 0.5 : scale > 1.0 ? 1.0 : scale;
+}
+
+bool Android_ShouldUseDrawScale(float scale)
+{
+    return scale >= 0.5 && scale < 1.0 && !(Android_JNI_IsInMultiWindowMode() || SDL_IsDeXMode() || SDL_IsChromebook());
+}
+
 void Android_SetScreenResolution(int surfaceWidth, int surfaceHeight, int deviceWidth, int deviceHeight, float density, float rate)
 {
     Android_SurfaceWidth = surfaceWidth;
@@ -296,8 +310,22 @@ void Android_SendResize(SDL_Window *window)
     }
 
     if (window) {
-        SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_RESIZED, Android_SurfaceWidth, Android_SurfaceHeight);
-    }
+        float scale = Android_GetDrawScale();
+        SDL_WindowData *data = (SDL_WindowData *)window->internal;
+        ANativeWindow* nw = (ANativeWindow*)data->native_window;
+        int32_t format_wanted = ANativeWindow_getFormat(nw);
+
+        if (Android_ShouldUseDrawScale(scale))
+        {
+            ANativeWindow_setBuffersGeometry(nw, (int)(Android_SurfaceWidth * scale), (int)(Android_SurfaceHeight * scale), format_wanted);
+            SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_RESIZED, (int)(Android_SurfaceWidth * scale), (int)(Android_SurfaceHeight * scale));
+        }
+        else
+        {
+            ANativeWindow_setBuffersGeometry(nw, 0, 0, format_wanted);
+            SDL_SendWindowEvent(window, SDL_EVENT_WINDOW_RESIZED, Android_SurfaceWidth, Android_SurfaceHeight);
+        }
+     }
 }
 
 void Android_SetWindowSafeAreaInsets(int left, int right, int top, int bottom)

project/lib/sdl/src/video/android/SDL_androidvideo.h

@@ -26,6 +26,8 @@
 #include "../SDL_sysvideo.h"
 
 // Called by the JNI layer when the screen changes size or format
+extern float Android_GetDrawScale();
+extern bool Android_ShouldUseDrawScale(float scale);
 extern void Android_SetScreenResolution(int surfaceWidth, int surfaceHeight, int deviceWidth, int deviceHeight, float density, float rate);
 extern void Android_SetFormat(int format_wanted, int format_got);
 extern void Android_SetOrientation(SDL_DisplayOrientation orientation);

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

@@ -53,11 +53,20 @@ bool Android_CreateWindow(SDL_VideoDevice *_this, SDL_Window *window, SDL_Proper
     // Set orientation
     Android_JNI_SetOrientation(window->w, window->h, window->flags & SDL_WINDOW_RESIZABLE, SDL_GetHint(SDL_HINT_ORIENTATIONS));
 
+    /* Adjust the resolution based on the configured draw scale */
+    float scale = Android_GetDrawScale();
+
     // Adjust the window data to match the screen
     window->x = 0;
     window->y = 0;
-    window->w = Android_SurfaceWidth;
-    window->h = Android_SurfaceHeight;
+
+    if (Android_ShouldUseDrawScale(scale)) {
+        window->w = (int)(Android_SurfaceWidth * scale);
+        window->h = (int)(Android_SurfaceHeight * scale);
+    } else {
+        window->w = Android_SurfaceWidth;
+        window->h = Android_SurfaceHeight;
+    }
 
     // One window, it always has focus
     SDL_SetMouseFocus(window);