diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 8ad1af889b..8f4de11678 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1561,7 +1561,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { } private fun followChoice(): Boolean { - val mode = SessionPrefs.prefMode(intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) + val mode = displayMode() return SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) == com.droiddeck.launcher.session.SessionDisplay.FOLLOW_SCREEN } @@ -1600,8 +1600,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { android.graphics.Rect(0, 0, metrics.widthPixels, metrics.heightPixels) } + private fun displayMode(): String = SessionPrefs.displayMode(this, + intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM, intent.getStringExtra(SessionService.EXTRA_PROGRAM)) + private fun outputSize(): Pair { - val mode = SessionPrefs.prefMode(intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) + val mode = displayMode() val panel = com.droiddeck.launcher.session.SessionDisplay.panelSize(this) val program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) val choice = if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && @@ -2963,7 +2966,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun glassesOutputSize(): Pair? { if (glassesScreen == null || glasses.width <= 0 || glasses.height <= 0) return null val panel = (if (glasses.sbs) glasses.width / 2 else glasses.width) to glasses.height - val mode = SessionPrefs.prefMode(intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM) + val mode = displayMode() val display = com.droiddeck.launcher.session.SessionDisplay val choice = SessionPrefs.resolutionChoice(this, mode, panel) val size = display.resolveChoice(panel, choice) diff --git a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt index 445a56348b..3bd000d7d1 100644 --- a/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt +++ b/app/src/main/java/com/droiddeck/launcher/runtime/UserApps.kt @@ -71,6 +71,9 @@ object UserApps { private fun menuEntry(context: Context, id: String) = File(LinuxRuntime.rootDir(context), "usr/local/share/applications/droiddeck-app-$id.desktop") + fun launches(program: String?): Boolean = + program == SCRIPT_LAUNCHER || program == AppImageManager.LAUNCHER || program == FlatpakManager.LAUNCHER + fun list(context: Context): List { val scripts = root(context).listFiles()?.filter { File(it, "entry").isFile }?.map { dir -> App( diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 4c4cd98086..f808be94de 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -878,6 +878,11 @@ object SessionPrefs { fun prefMode(mode: String): String = if (mode == SessionService.MODE_RUN) SessionService.MODE_STEAM else mode + fun displayMode(context: Context, mode: String, program: String?): String = + if (mode == SessionService.MODE_RUN && com.droiddeck.launcher.runtime.UserApps.launches(program) && + resolutionChosen(context, SessionService.MODE_DESKTOP)) SessionService.MODE_DESKTOP + else prefMode(mode) + fun pipAutoEnter(context: Context): Boolean = prefs(context).getBoolean("pipAutoEnter", false) fun setPipAutoEnter(context: Context, enabled: Boolean) { diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt index 62d8e4769b..03a3243910 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionScalingPrefsTest.kt @@ -40,6 +40,19 @@ class SessionScalingPrefsTest { assertEquals("800x600", SessionPrefs.resolutionChoice(context, "lxqt", 1440 to 1080)) } + @Test fun userAppsTakeTheDesktopResolutionOnceItIsChosen() { + val context = RuntimeEnvironment.getApplication() + val script = com.droiddeck.launcher.runtime.UserApps.SCRIPT_LAUNCHER + assertEquals("steam", SessionPrefs.displayMode(context, "run", script)) + SessionPrefs.setResolutionChoice(context, "lxqt", SessionDisplay.MATCH_SCREEN) + assertEquals("lxqt", SessionPrefs.displayMode(context, "run", script)) + assertEquals("lxqt", SessionPrefs.displayMode(context, "run", com.droiddeck.launcher.runtime.AppImageManager.LAUNCHER)) + val choice = SessionPrefs.resolutionChoice(context, SessionPrefs.displayMode(context, "run", script), 1240 to 1080) + assertEquals(1240 to 1080, SessionDisplay.resolveChoice(1240 to 1080, choice)) + assertEquals("steam", SessionPrefs.displayMode(context, "run", "/usr/bin/retroarch")) + assertEquals("steam", SessionPrefs.displayMode(context, "steam", script)) + } + @Test fun freshSettingsUseTheConcreteDefaultAndCustomSizesAreNormalized() { val context = RuntimeEnvironment.getApplication() assertEquals(SessionDisplay.DEFAULT_RESOLUTION, SessionPrefs.resolutionChoice(context, "steam", 2400 to 1080))