We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch MinimizeWindow

patch_bug_4580_android_minimize.diff (text/plain), 7.10 KB, created by Sylvain on 2019-04-23 19:54:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2019-04-23 19:54:03 UTC

Size: 7.10 KB

patch

obsolete

>diff -r 9b7633bd0aa0 android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
>--- a/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java	Tue Apr 23 07:59:31 2019 -0700
>+++ b/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java	Tue Apr 23 21:02:14 2019 +0200
>@@ -848,6 +848,43 @@
>     /**
>      * This method is called by SDL using JNI.
>      */
>+    public static void minimizeWindow() {
>+
>+        if (mSingleton == null) {
>+            return;
>+        }
>+ 
>+        Intent startMain = new Intent(Intent.ACTION_MAIN);
>+        startMain.addCategory(Intent.CATEGORY_HOME);
>+        startMain.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
>+        mSingleton.startActivity(startMain);
>+    }
>+
>+    /**
>+     * This method is called by SDL using JNI.
>+     */
>+    public static boolean shouldMinimizeOnFocusLoss() {
>+
>+        if (Build.VERSION.SDK_INT >= 24) {
>+            if (mSingleton == null) {
>+                return true;
>+            }
>+
>+            if (mSingleton.isInMultiWindowMode()) {
>+                return false;
>+            }
>+
>+            if (mSingleton.isInPictureInPictureMode()) {
>+                return false;
>+            }
>+        }
>+
>+        return true;
>+    }
>+ 
>+    /**
>+     * This method is called by SDL using JNI.
>+     */
>     public static boolean isScreenKeyboardShown()
>     {
>         if (mTextEdit == null) {
>diff -r 9b7633bd0aa0 src/core/android/SDL_android.c
>--- a/src/core/android/SDL_android.c	Tue Apr 23 07:59:31 2019 -0700
>+++ b/src/core/android/SDL_android.c	Tue Apr 23 21:02:14 2019 +0200
>@@ -236,6 +238,8 @@
> static jmethodID midSetActivityTitle;
> static jmethodID midSetWindowStyle;
> static jmethodID midSetOrientation;
>+static jmethodID midMinimizeWindow;
>+static jmethodID midShouldMinimizeOnFocusLoss;
> static jmethodID midGetContext;
> static jmethodID midIsTablet;
> static jmethodID midIsAndroidTV;
>@@ -483,9 +493,13 @@
>     midSetActivityTitle = (*env)->GetStaticMethodID(env, mActivityClass,
>                                 "setActivityTitle","(Ljava/lang/String;)Z");
>     midSetWindowStyle = (*env)->GetStaticMethodID(env, mActivityClass,
>                                 "setWindowStyle","(Z)V");
>     midSetOrientation = (*env)->GetStaticMethodID(env, mActivityClass,
>                                 "setOrientation","(IIZLjava/lang/String;)V");
>+    midMinimizeWindow = (*env)->GetStaticMethodID(env, mActivityClass,
>+                                "minimizeWindow","()V");
>+    midShouldMinimizeOnFocusLoss = (*env)->GetStaticMethodID(env, mActivityClass,
>+                                "shouldMinimizeOnFocusLoss","()Z");
>     midGetContext = (*env)->GetStaticMethodID(env, mActivityClass,
>                                 "getContext","()Landroid/content/Context;");
>     midIsTablet = (*env)->GetStaticMethodID(env, mActivityClass,
>@@ -528,10 +540,10 @@
> 
> 
>     if (!midGetNativeSurface || !midSetSurfaceViewFormat ||
>-       !midSetActivityTitle || !midSetWindowStyle || !midSetOrientation || !midGetContext || !midIsTablet || !midIsAndroidTV || !midInitTouch ||
>+       !midSetActivityTitle || !midSetWindowStyle || !midSetOrientation || !midMinimizeWindow || !midShouldMinimizeOnFocusLoss || !midGetContext || !midIsTablet || !midIsAndroidTV || !midInitTouch ||
>        !midSendMessage || !midShowTextInput || !midIsScreenKeyboardShown ||
>        !midClipboardSetText || !midClipboardGetText || !midClipboardHasText ||
>        !midOpenAPKExpansionInputStream || !midGetManifestEnvironmentVariables || !midGetDisplayDPI ||
>        !midCreateCustomCursor || !midSetCustomCursor || !midSetSystemCursor || !midSupportsRelativeMouse || !midSetRelativeMouseEnabled ||
>        !midIsChromebook || !midIsDeXMode || !midManualBackButton) {
>         __android_log_print(ANDROID_LOG_WARN, "SDL", "Missing some Java callbacks, do you have the latest version of SDLActivity.java?");
>@@ -1276,6 +1302,18 @@
>     (*env)->DeleteLocalRef(env, jhint);
> }
> 
>+void Android_JNI_MinizeWindow()
>+{
>+    JNIEnv *env = Android_JNI_GetEnv();
>+    (*env)->CallStaticVoidMethod(env, mActivityClass, midMinimizeWindow);
>+}
>+
>+SDL_bool Android_JNI_ShouldMinimizeOnFocusLoss()
>+{
>+    JNIEnv *env = Android_JNI_GetEnv();
>+    return (*env)->CallStaticBooleanMethod(env, mActivityClass, midShouldMinimizeOnFocusLoss);
>+}
>+
> SDL_bool Android_JNI_GetAccelerometerValues(float values[3])
> {
>     int i;
>diff -r 9b7633bd0aa0 src/core/android/SDL_android.h
>--- a/src/core/android/SDL_android.h	Tue Apr 23 07:59:31 2019 -0700
>+++ b/src/core/android/SDL_android.h	Tue Apr 23 21:02:14 2019 +0200
>@@ -39,6 +39,8 @@
> extern void Android_JNI_SetActivityTitle(const char *title);
> extern void Android_JNI_SetWindowStyle(SDL_bool fullscreen);
> extern void Android_JNI_SetOrientation(int w, int h, int resizable, const char *hint);
>+extern void Android_JNI_MinizeWindow(void);
>+extern SDL_bool Android_JNI_ShouldMinimizeOnFocusLoss(void);
> 
> extern SDL_bool Android_JNI_GetAccelerometerValues(float values[3]);
> extern void Android_JNI_ShowTextInput(SDL_Rect *inputRect);
>diff -r 9b7633bd0aa0 src/video/SDL_video.c
>--- a/src/video/SDL_video.c	Tue Apr 23 07:59:31 2019 -0700
>+++ b/src/video/SDL_video.c	Tue Apr 23 21:02:14 2019 +0200
>@@ -2659,6 +2659,15 @@
>     }
> #endif
> 
>+#ifdef __ANDROID__
>+    {
>+        extern SDL_bool Android_JNI_ShouldMinimizeOnFocusLoss(void);
>+        if (! Android_JNI_ShouldMinimizeOnFocusLoss()) {
>+            return SDL_FALSE;
>+        }
>+    }
>+#endif
>+
>     return SDL_GetHintBoolean(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, SDL_TRUE);
> }
> 
>diff -r 9b7633bd0aa0 src/video/android/SDL_androidvideo.c
>--- a/src/video/android/SDL_androidvideo.c	Tue Apr 23 07:59:31 2019 -0700
>+++ b/src/video/android/SDL_androidvideo.c	Tue Apr 23 21:02:14 2019 +0200
>@@ -127,6 +127,7 @@
>     device->CreateSDLWindow = Android_CreateWindow;
>     device->SetWindowTitle = Android_SetWindowTitle;
>     device->SetWindowFullscreen = Android_SetWindowFullscreen;
>+    device->MinimizeWindow = Android_MinimizeWindow;
>     device->DestroyWindow = Android_DestroyWindow;
>     device->GetWindowWMInfo = Android_GetWindowWMInfo;
> 
>diff -r 9b7633bd0aa0 src/video/android/SDL_androidwindow.c
>--- a/src/video/android/SDL_androidwindow.c	Tue Apr 23 07:59:31 2019 -0700
>+++ b/src/video/android/SDL_androidwindow.c	Tue Apr 23 21:02:14 2019 +0200
>@@ -162,6 +162,12 @@
> }
> 
> void
>+Android_MinimizeWindow(_THIS, SDL_Window *window)
>+{
>+    Android_JNI_MinizeWindow();
>+}
>+
>+void
> Android_DestroyWindow(_THIS, SDL_Window *window)
> {
>     SDL_LockMutex(Android_ActivityMutex);
>diff -r 9b7633bd0aa0 src/video/android/SDL_androidwindow.h
>--- a/src/video/android/SDL_androidwindow.h	Tue Apr 23 07:59:31 2019 -0700
>+++ b/src/video/android/SDL_androidwindow.h	Tue Apr 23 21:02:14 2019 +0200
>@@ -29,6 +29,8 @@
> extern int Android_CreateWindow(_THIS, SDL_Window *window);
> extern void Android_SetWindowTitle(_THIS, SDL_Window *window);
> extern void Android_SetWindowFullscreen(_THIS, SDL_Window *window, SDL_VideoDisplay *display, SDL_bool fullscreen);
>+extern void Android_MinimizeWindow(_THIS, SDL_Window *window);
>+
> extern void Android_DestroyWindow(_THIS, SDL_Window *window);
> extern SDL_bool Android_GetWindowWMInfo(_THIS, SDL_Window *window, struct SDL_SysWMinfo *info);
> extern SDL_Window *Android_Window;

Actions: View | Diff

Attachments on bug 4580: 3731 | 3752 | 3762

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.