From 50dace99588a6fb5375333a30dff568c10a8e95b Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Sat, 21 Nov 2026 22:21:08 +0300 Subject: [PATCH 1/5] feat(session): split the display resolution into landscape and portrait Landscape and Portrait resolution rows with the same options, each with a Follow option so one can mirror the other. Existing choices stay as the landscape resolution and portrait follows landscape by default, so nothing changes until portrait is set. --- .../droiddeck/launcher/FrontEndActivity.kt | 14 +++- .../com/droiddeck/launcher/SessionActivity.kt | 20 +++-- .../droiddeck/launcher/core/DeviceReport.kt | 8 +- .../launcher/session/SessionDisplay.kt | 20 +++++ .../launcher/session/SessionPrefs.kt | 36 +++++++-- .../launcher/ui/ModeSettingsDialog.kt | 15 +++- .../droiddeck/launcher/ui/ResolutionRow.kt | 18 +++-- app/src/main/res/values-ar/strings.xml | 5 +- app/src/main/res/values-b+es+419/strings.xml | 5 +- app/src/main/res/values-bg/strings.xml | 5 +- app/src/main/res/values-cs/strings.xml | 5 +- app/src/main/res/values-da/strings.xml | 5 +- app/src/main/res/values-de/strings.xml | 5 +- app/src/main/res/values-el/strings.xml | 5 +- app/src/main/res/values-es/strings.xml | 5 +- app/src/main/res/values-fi/strings.xml | 5 +- app/src/main/res/values-fr/strings.xml | 5 +- app/src/main/res/values-hi/strings.xml | 5 +- app/src/main/res/values-hu/strings.xml | 5 +- app/src/main/res/values-in/strings.xml | 5 +- app/src/main/res/values-it/strings.xml | 5 +- app/src/main/res/values-ja/strings.xml | 5 +- app/src/main/res/values-ko/strings.xml | 5 +- app/src/main/res/values-ms/strings.xml | 5 +- app/src/main/res/values-nb/strings.xml | 5 +- app/src/main/res/values-nl/strings.xml | 5 +- app/src/main/res/values-pl/strings.xml | 5 +- app/src/main/res/values-pt-rPT/strings.xml | 5 +- app/src/main/res/values-pt/strings.xml | 5 +- app/src/main/res/values-ro/strings.xml | 5 +- app/src/main/res/values-ru/strings.xml | 5 +- app/src/main/res/values-sv/strings.xml | 5 +- app/src/main/res/values-th/strings.xml | 5 +- app/src/main/res/values-tr/strings.xml | 5 +- app/src/main/res/values-uk/strings.xml | 5 +- app/src/main/res/values-vi/strings.xml | 5 +- app/src/main/res/values-zh-rCN/strings.xml | 5 +- app/src/main/res/values-zh-rHK/strings.xml | 5 +- app/src/main/res/values-zh-rTW/strings.xml | 5 +- app/src/main/res/values/strings.xml | 5 +- .../session/PortraitResolutionTest.kt | 73 +++++++++++++++++++ 41 files changed, 305 insertions(+), 64 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index ca5e23cef..66e718dc2 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -585,6 +585,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet } private var settingsMode by mutableStateOf(null) private var resolution by mutableStateOf(com.droiddeck.launcher.session.SessionDisplay.DEFAULT_RESOLUTION) + private var resolutionPortrait by mutableStateOf(com.droiddeck.launcher.session.SessionDisplay.LINK_LANDSCAPE) private var fexPreset by mutableStateOf("") private var forceSsbs by mutableStateOf(false) private var steamClientArch by mutableStateOf("arm64") @@ -2588,7 +2589,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet if (settingsMode != mode) return com.droiddeck.launcher.ui.ModeSheetRows( ModeSettings( - mode = mode, resolution = resolution, + mode = mode, resolution = resolution, resolutionPortrait = resolutionPortrait, panelSize = com.droiddeck.launcher.session.SessionDisplay.panelSize(this), hdr = hdrOn, hdrReason = hdrReason, hdrDisplay = hdrDisplay, zeroCopy = zeroCopyOn, upscaler = upscaler, upscaleSharpness = upscaleSharpness, @@ -2643,7 +2644,8 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet onIntegration = ::configureIntegration, onIntegrationAppInfo = ::openAppInfo, onIntegrationLocation = ::openWifiDiscoverySettings, - onResolution = { value -> SessionPrefs.setResolutionChoice(this, mode, value); resolution = value }, + onResolution = { value -> SessionPrefs.setResolutionChoice(this, mode, value); loadResolutions(mode) }, + onResolutionPortrait = { value -> SessionPrefs.setResolutionChoice(this, mode, value, portrait = true); loadResolutions(mode) }, onHdr = { on -> com.droiddeck.launcher.session.SessionHdr.set(this, mode, on); hdrOn = on }, onZeroCopy = { on -> SessionPrefs.setZeroCopy(this, mode, on); zeroCopyOn = on @@ -2976,11 +2978,17 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, "shader-precache").start() } + private fun loadResolutions(mode: String) { + val panel = com.droiddeck.launcher.session.SessionDisplay.panelSize(this) + resolution = SessionPrefs.resolutionStored(this, mode, panel, false) + resolutionPortrait = SessionPrefs.resolutionStored(this, mode, panel, true) + } + private fun loadModeSettings(mode: String) { pipAutoEnter = SessionPrefs.pipAutoEnter(this) unfoldedControls = SessionPrefs.unfoldedControls(this) unfoldedControlsWithController = SessionPrefs.unfoldedControlsWithController(this) - resolution = SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) + loadResolutions(mode) fexPreset = SessionPrefs.fexPreset(this) forceSsbs = SessionPrefs.forceSsbs(this) fastSync = SessionPrefs.fastSync(this) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index a95ae0911..bc4031946 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2958,14 +2958,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun followScale(): Float { val mode = displayMode() - val choice = SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) + val choice = SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), portraitOutput()) return com.droiddeck.launcher.session.SessionDisplay.followScale(choice) ?: 1f } private fun followChoice(): Boolean { val mode = displayMode() return com.droiddeck.launcher.session.SessionDisplay.isFollow( - SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this))) + SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), portraitOutput())) } private fun applyFollowOrientation(config: android.content.res.Configuration) { @@ -3031,17 +3031,21 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun displayMode(): String = SessionPrefs.displayMode(this, intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM, intent.getStringExtra(SessionService.EXTRA_PROGRAM)) - private fun outputSize(): Pair = - com.droiddeck.launcher.session.SessionDisplay.resolveChoice(com.droiddeck.launcher.session.SessionDisplay.panelSize(this), - resolutionChoice(), SessionPrefs.portrait(this) && !controlsBelowWanted()) + private fun portraitOutput(): Boolean = SessionPrefs.portrait(this) && !controlsBelowWanted() - private fun resolutionChoice(): String { + private fun outputSize(): Pair { + val portrait = portraitOutput() + return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(com.droiddeck.launcher.session.SessionDisplay.panelSize(this), + resolutionChoice(portrait), portrait) + } + + private fun resolutionChoice(portrait: Boolean = portraitOutput()): String { val mode = displayMode() val program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) return if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && - Library.drawsAtPanel(program) && !SessionPrefs.resolutionChosen(this, mode)) + Library.drawsAtPanel(program) && !SessionPrefs.resolutionChosen(this, mode, portrait)) com.droiddeck.launcher.session.SessionDisplay.MATCH_SCREEN - else SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this)) + else SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), portrait) } private fun refreshHz(): Float = refreshHz(null) diff --git a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt index dbc78c6a2..6cd258555 100644 --- a/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt +++ b/app/src/main/java/com/droiddeck/launcher/core/DeviceReport.kt @@ -207,9 +207,11 @@ object DeviceReport { k("refresh_rate_mode", runCatching { Settings.Secure.getString(context.contentResolver, "refresh_rate_mode") }.getOrNull() ?: "not set") val panelSize = com.droiddeck.launcher.session.SessionDisplay.panelSize(context) for ((label, mode) in listOf("Resolution (Steam)" to SessionService.MODE_STEAM, "Resolution (Desktop)" to SessionService.MODE_DESKTOP)) { - val choice = SessionPrefs.resolutionChoice(context, mode, panelSize) - val size = com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panelSize, choice) - k(label, "$choice (${size.first}x${size.second})") + for ((suffix, portrait) in listOf("landscape" to false, "portrait" to true)) { + val choice = SessionPrefs.resolutionChoice(context, mode, panelSize, portrait) + val size = com.droiddeck.launcher.session.SessionDisplay.resolveChoice(panelSize, choice, portrait) + k("$label $suffix", "$choice (${size.first}x${size.second})") + } } k("Foldable", context.packageManager.hasSystemFeature("android.hardware.sensor.hinge_angle")) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt index 9b253d88a..a9f809c07 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt @@ -12,6 +12,9 @@ object SessionDisplay { const val FOLLOW_SCALE_MAX = 8f private const val FOLLOW_SCALED_PREFIX = "follow/" + const val LINK_LANDSCAPE = "link/landscape" + const val LINK_PORTRAIT = "link/portrait" + const val DEFAULT_RESOLUTION = "720p" private val PRESET_HEIGHTS = listOf(720, 900, 1080) @@ -35,6 +38,23 @@ object SessionDisplay { else -> null } + fun isLink(choice: String): Boolean = choice == LINK_LANDSCAPE || choice == LINK_PORTRAIT + + fun orientCustom(choice: String, portrait: Boolean): String { + val parts = choice.split('x').map { it.toIntOrNull() } + if (parts.size != 2 || parts.any { it == null || it <= 0 }) return choice + val width = parts[0]!! + val height = parts[1]!! + return if ((portrait && width > height) || (!portrait && height > width)) "${height}x$width" else choice + } + + fun effectiveChoice(landscape: String, portrait: String, forPortrait: Boolean): String { + val own = if (forPortrait) portrait else landscape + if (!isLink(own)) return own + val other = if (forPortrait) landscape else portrait + return if (isLink(other)) DEFAULT_RESOLUTION else orientCustom(other, forPortrait) + } + fun screenSize(panel: Pair): Pair = (maxOf(panel.first, panel.second) and 1.inv()) to (minOf(panel.first, panel.second) and 1.inv()) 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 09c0b781e..f243d3f31 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1296,14 +1296,27 @@ object SessionPrefs { private fun resolutionCap(context: Context, mode: String): Int = prefs(context).getInt("resolutionCap.$mode", 720) - fun resolutionChosen(context: Context, mode: String): Boolean = + fun resolutionChosen(context: Context, mode: String, portrait: Boolean = false): Boolean = prefs(context).contains("displayResolution.$mode") || - prefs(context).contains("resolutionCap.$mode") || customResolution(context, mode) != null + prefs(context).contains("resolutionCap.$mode") || customResolution(context, mode) != null || + (portrait && prefs(context).contains("displayResolution.portrait.$mode")) - fun resolutionChoice(context: Context, mode: String, panel: Pair): String { + fun resolutionChoice(context: Context, mode: String, panel: Pair, portrait: Boolean = false): String = + SessionDisplay.effectiveChoice( + resolutionStored(context, mode, panel, false), resolutionStored(context, mode, panel, true), portrait) + + fun resolutionStored(context: Context, mode: String, panel: Pair, portrait: Boolean): String { + if (!portrait) return landscapeResolutionStored(context, mode, panel) + val value = prefs(context).getString("displayResolution.portrait.$mode", null) ?: return SessionDisplay.LINK_LANDSCAPE + if (value == SessionDisplay.LINK_LANDSCAPE || value == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(value) || + SessionDisplay.presetHeight(value) != null) return value + return parseResolution(value)?.let { "${it.first}x${it.second}" } ?: SessionDisplay.LINK_LANDSCAPE + } + + private fun landscapeResolutionStored(context: Context, mode: String, panel: Pair): String { val saved = prefs(context) saved.getString("displayResolution.$mode", null)?.let { value -> - if (value == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(value) || + if (value == SessionDisplay.MATCH_SCREEN || value == SessionDisplay.LINK_PORTRAIT || SessionDisplay.isFollow(value) || SessionDisplay.presetHeight(value) != null) return value parseResolution(value)?.let { return "${it.first}x${it.second}" } } @@ -1315,13 +1328,22 @@ object SessionPrefs { else "${legacy.first}x${legacy.second}" } - fun setResolutionChoice(context: Context, mode: String, choice: String) { - val value = if (choice == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(choice) || + fun setResolutionChoice(context: Context, mode: String, choice: String, portrait: Boolean = false) { + val link = if (portrait) SessionDisplay.LINK_LANDSCAPE else SessionDisplay.LINK_PORTRAIT + val value = if (choice == link || choice == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(choice) || SessionDisplay.presetHeight(choice) != null) choice else { val size = requireNotNull(parseResolution(choice)) { "Invalid resolution" } "${size.first}x${size.second}" } - prefs(context).edit().putString("displayResolution.$mode", value).apply() + val panel = SessionDisplay.panelSize(context) + val landscapeStored = resolutionStored(context, mode, panel, false) + val portraitStored = resolutionStored(context, mode, panel, true) + val edit = prefs(context).edit() + if (value == link && SessionDisplay.isLink(if (portrait) landscapeStored else portraitStored)) { + val concrete = SessionDisplay.effectiveChoice(landscapeStored, portraitStored, !portrait) + edit.putString(if (portrait) "displayResolution.$mode" else "displayResolution.portrait.$mode", concrete) + } + edit.putString(if (portrait) "displayResolution.portrait.$mode" else "displayResolution.$mode", value).apply() } fun fexPreset(context: Context): String = prefs(context).getString("fexPreset", DEFAULT_FEX_PRESET) ?: DEFAULT_FEX_PRESET diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 73580d867..9d0933aa6 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -56,6 +56,7 @@ class DownloadRow(val key: String, val label: String, val detail: String, val pr class ModeSettings( val mode: String, val resolution: String, + val resolutionPortrait: String = com.droiddeck.launcher.session.SessionDisplay.LINK_LANDSCAPE, val panelSize: Pair = 1280 to 720, val hdr: Boolean, val hdrReason: String?, @@ -116,6 +117,7 @@ class ModeSettings( class ModeSettingsActions( val onResolution: (String) -> Unit, + val onResolutionPortrait: (String) -> Unit = {}, val onHdr: (Boolean) -> Unit, val onZeroCopy: (Boolean) -> Unit = {}, val onGpuDrivers: () -> Unit = {}, @@ -234,9 +236,16 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: val controlsBelow = SessionPrefs.controlsBelowWanted(context, s.mode, if (portraitWindow) shortSide else longSide, if (portraitWindow) longSide else shortSide) val portrait = portraitWindow && !controlsBelow - val displaySize = com.droiddeck.launcher.session.SessionDisplay.resolveChoice(s.panelSize, s.resolution, portrait) + val sessionDisplay = com.droiddeck.launcher.session.SessionDisplay + val landscapeChoice = sessionDisplay.effectiveChoice(s.resolution, s.resolutionPortrait, false) + val portraitChoice = sessionDisplay.effectiveChoice(s.resolution, s.resolutionPortrait, true) + val activeChoice = if (portrait) portraitChoice else landscapeChoice + val displaySize = sessionDisplay.resolveChoice(s.panelSize, activeChoice, portrait) SettingsGroup(stringResource(R.string.display_session)) { - ResolutionRow(host, s.resolution, s.panelSize, a.onResolution, portrait = portrait) + ResolutionRow(host, "resolution", stringResource(R.string.display_resolution_landscape), s.resolution, landscapeChoice, + com.droiddeck.launcher.session.SessionDisplay.LINK_PORTRAIT, s.panelSize, a.onResolution, portrait = false) + ResolutionRow(host, "resolution-portrait", stringResource(R.string.display_resolution_portrait), s.resolutionPortrait, portraitChoice, + com.droiddeck.launcher.session.SessionDisplay.LINK_LANDSCAPE, s.panelSize, a.onResolutionPortrait, portrait = true) s.picturePosition?.let { position -> ChoiceRow(host, "picture-position", stringResource(R.string.display_picture_position), null, listOf("top" to stringResource(R.string.display_position_top), @@ -248,7 +257,7 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: } if (s.stretch16x9 != null && (com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(s.panelSize) || com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize))) { - val canStretch = !com.droiddeck.launcher.session.SessionDisplay.isFollow(s.resolution) && + val canStretch = !com.droiddeck.launcher.session.SessionDisplay.isFollow(activeChoice) && com.droiddeck.launcher.session.SessionDisplay.canStretch16x9(displaySize) ChoiceRow(host, "game-fit", stringResource(R.string.display_game_fit), stringResource(if (canStretch) R.string.display_game_fit_hint else R.string.display_game_fit_unavailable), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt index 7112d4f39..efcbbc526 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt @@ -12,20 +12,24 @@ import com.droiddeck.launcher.session.SessionDisplay @Composable fun ResolutionRow( - host: MenuHost, choice: String, panel: Pair, onPick: (String) -> Unit, + host: MenuHost, id: String, title: String, stored: String, choice: String, link: String, + panel: Pair, onPick: (String) -> Unit, chipModifier: Modifier = Modifier, portrait: Boolean = false, ) { val custom = "custom" + val linked = stored == link val size = SessionDisplay.resolveChoice(panel, choice, portrait) val screen = SessionDisplay.resolveChoice(panel, SessionDisplay.MATCH_SCREEN, portrait) val choices = SessionDisplay.resolutionOptions(panel) - val customFollow = SessionDisplay.isFollow(choice) && choice !in choices - val selected = if (SessionDisplay.isFollow(choice)) choice + val customFollow = !linked && SessionDisplay.isFollow(choice) && choice !in choices + val selected = if (linked) link else if (SessionDisplay.isFollow(choice)) choice else if (size == screen) SessionDisplay.MATCH_SCREEN else choice var editCustom by remember { mutableStateOf(false) } var editFollow by remember { mutableStateOf(false) } - val options = choices.map { value -> + val linkLabel = stringResource(if (link == SessionDisplay.LINK_LANDSCAPE) R.string.display_follow_landscape else R.string.display_follow_portrait, + size.first, size.second) + val options = listOf(link to linkLabel) + choices.map { value -> val dimensions = SessionDisplay.resolveChoice(panel, value, portrait) value to if (value == SessionDisplay.MATCH_SCREEN) stringResource(R.string.display_match_screen, screen.first, screen.second) else if (value == SessionDisplay.FOLLOW_SCREEN) stringResource(R.string.display_follow_screen) @@ -35,11 +39,11 @@ fun ResolutionRow( else "${dimensions.first}×${dimensions.second}" } + listOf(SessionDisplay.FOLLOW_CUSTOM to stringResource(R.string.display_follow_screen_scaled, if (customFollow) SessionDisplay.formatScale(SessionDisplay.followScale(choice) ?: 1f) else "…" - ) + if (customFollow) " (${size.first}×${size.second})" else "") + (custom to if (selected in choices) stringResource(R.string.mode_res_custom) + ) + if (customFollow) " (${size.first}×${size.second})" else "") + (custom to if (selected in choices || linked) stringResource(R.string.mode_res_custom) else stringResource(R.string.mode_res_custom_value, size.first, size.second)) - ChoiceRow(host, "resolution", stringResource(R.string.display_resolution), + ChoiceRow(host, id, title, stringResource(R.string.common_applies_next_session), - options, if (selected in choices) selected else if (customFollow) SessionDisplay.FOLLOW_CUSTOM else custom, chipModifier = chipModifier, + options, if (linked || selected in choices) selected else if (customFollow) SessionDisplay.FOLLOW_CUSTOM else custom, chipModifier = chipModifier, onPick = { value -> if (value == custom) editCustom = true else if (value == SessionDisplay.FOLLOW_CUSTOM) editFollow = true diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d47088cf0..b236ec795 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -2565,7 +2565,10 @@ %1$s. %2$s\n\n%3$s شاشة الجلسة العرض بدون نسخ - الدقة + دقة الوضع الأفقي + دقة الوضع العمودي + اتباع الأفقي (%1$d×%2$d) + اتباع العمودي (%1$d×%2$d) ملاءمة اللعبة لنسبة 16:9 كيفية ملاءمة ألعاب 16:9 لهذه الشاشة. يُطبَّق في الجلسة التالية. اختر «مطابقة الشاشة» أو حجمًا مخصَّصًا أضيق من 16:9. diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 5549df743..c1505584f 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -2557,7 +2557,10 @@ %1$s. %2$s\n\n%3$s Pantalla de la sesión Presentación sin copia - Resolución + Resolución horizontal + Resolución vertical + Igual que horizontal (%1$d×%2$d) + Igual que vertical (%1$d×%2$d) Ajuste de juegos 16:9 Cómo se ajustan los juegos 16:9 a esta pantalla. Próxima sesión. Elige Igual a la pantalla o un tamaño personalizado más estrecho que 16:9. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 38005ba0b..dc9116e96 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -2461,7 +2461,10 @@ %1$s. %2$s\n\n%3$s Екран на сесията Представяне без копиране - Разделителна способност + Резолюция в пейзажен режим + Резолюция в портретен режим + Като пейзажния (%1$d×%2$d) + Като портретния (%1$d×%2$d) Напасване на игра 16:9 Как игрите с 16:9 се напасват на този екран. При следващата сесия. Избери „Напасване на екрана“ или собствен размер, по-тесен от 16:9. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index e659eaf25..d566a893f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -2513,7 +2513,10 @@ %1$s. %2$s\n\n%3$s Obrazovka relace Zobrazení bez kopírování - Rozlišení + Rozlišení na šířku + Rozlišení na výšku + Jako na šířku (%1$d×%2$d) + Jako na výšku (%1$d×%2$d) Přizpůsobení hry 16:9 Jak se hry s poměrem 16:9 přizpůsobí této obrazovce. Příští relace. Vyberte Podle obrazovky nebo vlastní velikost užší než 16:9. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b1de62f68..e1c48d2cc 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2461,7 +2461,10 @@ %1$s. %2$s\n\n%3$s Sessionsskærm Præsentation uden kopiering - Opløsning + Opløsning i landskab + Opløsning i portræt + Følg landskab (%1$d×%2$d) + Følg portræt (%1$d×%2$d) 16:9-spiltilpasning Hvordan 16:9-spil tilpasses denne skærm. Fra næste session. Vælg Match skærm eller en brugerdefineret størrelse, der er smallere end 16:9. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e24db0150..f986336c0 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2453,7 +2453,10 @@ %1$s. %2$s\n\n%3$s Sitzungsanzeige Kopierfreie Darstellung - Auflösung + Auflösung im Querformat + Auflösung im Hochformat + Wie Querformat (%1$d×%2$d) + Wie Hochformat (%1$d×%2$d) 16:9-Spielanpassung Wie 16:9-Spiele auf dieses Display passen. Ab der nächsten Sitzung. Wähle „An Bildschirm anpassen“ oder eine eigene Größe schmaler als 16:9. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 4bb5fc734..47cddc9a9 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -2461,7 +2461,10 @@ %1$s. %2$s\n\n%3$s Οθόνη συνεδρίας Παρουσίαση χωρίς αντιγραφή - Ανάλυση + Ανάλυση σε οριζόντιο προσανατολισμό + Ανάλυση σε κατακόρυφο προσανατολισμό + Ίδια με οριζόντιο (%1$d×%2$d) + Ίδια με κατακόρυφο (%1$d×%2$d) Προσαρμογή παιχνιδιού 16:9 Πώς προσαρμόζονται τα παιχνίδια 16:9 σε αυτή την οθόνη. Από την επόμενη συνεδρία. Επιλέξτε Αντιστοίχιση οθόνης ή ένα προσαρμοσμένο μέγεθος πιο στενό από 16:9. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 354828c59..637678281 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -2487,7 +2487,10 @@ %1$s. %2$s\n\n%3$s Pantalla de la sesión Presentación sin copia - Resolución + Resolución horizontal + Resolución vertical + Igual que horizontal (%1$d×%2$d) + Igual que vertical (%1$d×%2$d) Ajuste de juegos 16:9 Cómo se ajustan los juegos 16:9 a esta pantalla. Próxima sesión. Elige Igual a la pantalla o un tamaño personalizado más estrecho que 16:9. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 48387e680..47d447af2 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -2461,7 +2461,10 @@ %1$s. %2$s\n\n%3$s Istunnon näyttö Kopioimaton esitys - Tarkkuus + Vaakatilan resoluutio + Pystytilan resoluutio + Seuraa vaakaa (%1$d×%2$d) + Seuraa pystyä (%1$d×%2$d) 16:9-pelin sovitus Miten 16:9-pelit sovitetaan tähän näyttöön. Seuraava istunto. Valitse Sovita näyttöön tai mukautettu koko, joka on 16:9:ää kapeampi. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 90348a7ed..ae3d8f72b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2486,7 +2486,10 @@ %1$s. %2$s\n\n%3$s Affichage de la session Affichage sans copie - Résolution + Résolution en paysage + Résolution en portrait + Comme le paysage (%1$d×%2$d) + Comme le portrait (%1$d×%2$d) Ajustement des jeux 16:9 Comment les jeux 16:9 s\'adaptent à cet écran. À la prochaine session. Choisissez « Adapter à l\'écran » ou une taille personnalisée plus étroite que 16:9. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index bac24154f..109385a8e 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -2461,7 +2461,10 @@ %1$s। %2$s\n\n%3$s सेशन डिस्प्ले बिना कॉपी प्रस्तुति - रिज़ॉल्यूशन + लैंडस्केप रेज़ोल्यूशन + पोर्ट्रेट रेज़ोल्यूशन + लैंडस्केप जैसा (%1$d×%2$d) + पोर्ट्रेट जैसा (%1$d×%2$d) 16:9 गेम फ़िट 16:9 गेम इस डिस्प्ले में कैसे फ़िट होते हैं। अगले सेशन से। Match screen चुनें या 16:9 से पतला कस्टम आकार चुनें। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index f2a0cf774..d512c7256 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -2461,7 +2461,10 @@ %1$s. %2$s\n\n%3$s Munkamenet kijelzője Másolásmentes megjelenítés - Felbontás + Fekvő felbontás + Álló felbontás + Mint a fekvő (%1$d×%2$d) + Mint az álló (%1$d×%2$d) 16:9 játék illesztése Hogyan illeszkednek a 16:9 játékok ehhez a kijelzőhöz. A következő munkamenettől. Válassza a Képernyőhöz illesztést, vagy egy 16:9-nél szűkebb egyéni méretet. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 67516678d..1f36e3553 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -2436,7 +2436,10 @@ %1$s. %2$s\n\n%3$s Tampilan sesi Presentasi tanpa salin - Resolusi + Resolusi lanskap + Resolusi potret + Ikuti lanskap (%1$d×%2$d) + Ikuti potret (%1$d×%2$d) Penyesuaian gim 16:9 Cara gim 16:9 disesuaikan dengan tampilan ini. Berlaku pada sesi berikutnya. Pilih Sesuaikan layar atau ukuran khusus yang lebih sempit dari 16:9. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index ce0632f45..d41da79a4 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -2478,7 +2478,10 @@ %1$s. %2$s\n\n%3$s Schermo della sessione Presentazione senza copia - Risoluzione + Risoluzione orizzontale + Risoluzione verticale + Come orizzontale (%1$d×%2$d) + Come verticale (%1$d×%2$d) Adattamento giochi 16:9 Come i giochi 16:9 si adattano a questo schermo. Dalla prossima sessione. Scegli Adatta allo schermo o una dimensione personalizzata più stretta di 16:9. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 2b37a6844..130ef4445 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -2436,7 +2436,10 @@ %1$s。%2$s\n\n%3$s セッションの表示 ゼロコピー表示 - 解像度 + 横向きの解像度 + 縦向きの解像度 + 横向きに合わせる (%1$d×%2$d) + 縦向きに合わせる (%1$d×%2$d) 16:9ゲームの表示 16:9のゲームをこのディスプレイにどう合わせるか。次回のセッションから。 「画面に合わせる」か、16:9より縦長のカスタムサイズを選んでください。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ca9a31ec9..267eff113 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -2436,7 +2436,10 @@ %1$s. %2$s\n\n%3$s 세션 디스플레이 제로카피 표시 - 해상도 + 가로 해상도 + 세로 해상도 + 가로와 동일 (%1$d×%2$d) + 세로와 동일 (%1$d×%2$d) 16:9 게임 맞춤 16:9 게임을 이 디스플레이에 맞추는 방식입니다. 다음 세션부터 적용됩니다. 화면에 맞춤 또는 16:9보다 좁은 사용자 정의 크기를 선택하세요. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index 769c6f2c7..ccfcb1b69 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -2436,7 +2436,10 @@ %1$s. %2$s\n\n%3$s Paparan sesi Paparan tanpa salinan - Resolusi + Resolusi landskap + Resolusi potret + Ikut landskap (%1$d×%2$d) + Ikut potret (%1$d×%2$d) Suaian permainan 16:9 Cara permainan 16:9 disuaikan ke paparan ini. Sesi seterusnya. Pilih Sepadan skrin atau saiz tersuai lebih nipis daripada 16:9. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 2533182c7..d9d6d76a6 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -2461,7 +2461,10 @@ %1$s. %2$s\n\n%3$s Sesjonsskjerm Presentasjon uten kopiering - Oppløsning + Oppløsning i liggende + Oppløsning i stående + Følg liggende (%1$d×%2$d) + Følg stående (%1$d×%2$d) 16:9-spilltilpasning Hvordan 16:9-spill tilpasses denne skjermen. Fra neste sesjon. Velg Tilpass skjerm eller en egendefinert størrelse smalere enn 16:9. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index be6d86c50..0f3ba678f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -2461,7 +2461,10 @@ %1$s. %2$s\n\n%3$s Sessiescherm Weergave zonder kopie - Resolutie + Resolutie in liggend + Resolutie in staand + Volg liggend (%1$d×%2$d) + Volg staand (%1$d×%2$d) 16:9-beeldvulling Hoe 16:9-games dit scherm vullen. Volgende sessie. Kies Schermformaat of een aangepast formaat dat smaller is dan 16:9. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 80486fc3c..85b3ed455 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -2513,7 +2513,10 @@ %1$s. %2$s\n\n%3$s Ekran sesji Prezentacja bez kopiowania - Rozdzielczość + Rozdzielczość w poziomie + Rozdzielczość w pionie + Jak w poziomie (%1$d×%2$d) + Jak w pionie (%1$d×%2$d) Dopasowanie gier 16:9 Jak gry 16:9 mieszczą się na tym ekranie. Od następnej sesji. Wybierz „Dopasuj do ekranu” lub własny rozmiar węższy niż 16:9. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 19e92b33f..44e3b263b 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -2492,7 +2492,10 @@ %1$s. %2$s\n\n%3$s Ecrã da sessão Apresentação sem cópia - Resolução + Resolução na horizontal + Resolução na vertical + Igual à horizontal (%1$d×%2$d) + Igual à vertical (%1$d×%2$d) Ajuste de jogos 16:9 Como os jogos 16:9 se ajustam a este ecrã. Próxima sessão. Escolha «Igual ao ecrã» ou um tamanho personalizado mais estreito do que 16:9. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index aa4a3fec3..f74544621 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -2500,7 +2500,10 @@ %1$s. %2$s\n\n%3$s Tela da sessão Apresentação sem cópia - Resolução + Resolução na horizontal + Resolução na vertical + Igual à horizontal (%1$d×%2$d) + Igual à vertical (%1$d×%2$d) Ajuste de jogos 16:9 Como os jogos 16:9 se ajustam a esta tela. Na próxima sessão. Escolha Igual à tela ou um tamanho personalizado mais estreito que 16:9. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index fa7ba5654..b43faecae 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -2487,7 +2487,10 @@ %1$s. %2$s\n\n%3$s Afișajul sesiunii Prezentare fără copiere - Rezoluție + Rezoluție în peisaj + Rezoluție în portret + Ca peisajul (%1$d×%2$d) + Ca portretul (%1$d×%2$d) Potrivire joc 16:9 Cum se potrivesc jocurile 16:9 cu acest afișaj. Sesiunea următoare. Alege Potrivire ecran sau o dimensiune personalizată mai îngustă decât 16:9. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 1cf83c57c..4de7f5cac 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -2513,7 +2513,10 @@ %1$s. %2$s\n\n%3$s Экран сессии Вывод без копирования - Разрешение + Разрешение в альбомной ориентации + Разрешение в портретной ориентации + Как в альбомной (%1$d×%2$d) + Как в портретной (%1$d×%2$d) Игры 16:9 Как игры 16:9 вписываются в этот экран. Вступит в силу в следующей сессии. Выберите «По размеру экрана» или свой размер уже 16:9. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 1669d9b65..e8b824c9c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -2461,7 +2461,10 @@ %1$s. %2$s\n\n%3$s Sessionsskärm Presentation utan kopiering - Upplösning + Upplösning i liggande + Upplösning i stående + Följ liggande (%1$d×%2$d) + Följ stående (%1$d×%2$d) 16:9-spelanpassning Hur 16:9-spel anpassas till den här skärmen. Nästa session. Välj Matcha skärmen eller en anpassad storlek som är smalare än 16:9. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index d2067ebb2..34d772a59 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -2436,7 +2436,10 @@ %1$s %2$s\n\n%3$s การแสดงผลของเซสชัน การแสดงผลแบบไม่คัดลอก - ความละเอียด + ความละเอียดแนวนอน + ความละเอียดแนวตั้ง + ตามแนวนอน (%1$d×%2$d) + ตามแนวตั้ง (%1$d×%2$d) การแสดงเกม 16:9 ให้พอดี วิธีที่เกม 16:9 แสดงพอดีกับหน้าจอนี้ มีผลในเซสชันถัดไป เลือกพอดีหน้าจอ หรือขนาดกำหนดเองที่แคบกว่า 16:9 diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 015e08097..725a568c1 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -2453,7 +2453,10 @@ %1$s. %2$s\n\n%3$s Oturum ekranı Kopyasız sunum - Çözünürlük + Yatay çözünürlük + Dikey çözünürlük + Yatayı izle (%1$d×%2$d) + Dikeyi izle (%1$d×%2$d) 16:9 oyun sığdırma 16:9 oyunların bu ekrana nasıl sığacağı. Sonraki oturumda. Ekrana Uydur\'u veya 16:9\'dan daha dar özel bir boyutu seçin. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 0ae16d9a5..cf0594346 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -2513,7 +2513,10 @@ %1$s. %2$s\n\n%3$s Дисплей сеансу Показ без копіювання - Роздільна здатність + Роздільна здатність в альбомній орієнтації + Роздільна здатність у портретній орієнтації + Як в альбомній (%1$d×%2$d) + Як у портретній (%1$d×%2$d) Вписування гри 16:9 Як ігри 16:9 вписуються в цей дисплей. З наступного сеансу. Виберіть «Під екран» або власний розмір, вужчий за 16:9. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index a2601eb6c..290bf2b03 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -2436,7 +2436,10 @@ %1$s. %2$s\n\n%3$s Hiển thị phiên Hiển thị không sao chép - Độ phân giải + Độ phân giải chiều ngang + Độ phân giải chiều dọc + Theo chiều ngang (%1$d×%2$d) + Theo chiều dọc (%1$d×%2$d) Khớp game 16:9 Cách game 16:9 khớp với màn hình này. Từ phiên sau. Chọn Khớp màn hình hoặc một kích thước tùy chỉnh hẹp hơn 16:9. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 802aa2827..70cda7d67 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -2513,7 +2513,10 @@ %1$s。%2$s\n\n%3$s 会话显示 零拷贝呈现 - 分辨率 + 横屏分辨率 + 竖屏分辨率 + 跟随横屏 (%1$d×%2$d) + 跟随竖屏 (%1$d×%2$d) 16:9 游戏适配 16:9 游戏如何适配此屏幕。下次会话生效。 请选择“匹配屏幕”或比 16:9 更窄的自定义尺寸。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index b7b9481b5..93608c774 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -2433,7 +2433,10 @@ %1$s。%2$s\n\n%3$s 會話顯示 零複製呈現 - 解像度 + 橫向解析度 + 直向解析度 + 跟隨橫向 (%1$d×%2$d) + 跟隨直向 (%1$d×%2$d) 16:9 遊戲顯示方式 16:9 遊戲如何配合此螢幕。下次會話生效。 請選擇「配合螢幕」或比 16:9 更窄的自訂尺寸。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 945485063..5a8eaf443 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -2433,7 +2433,10 @@ %1$s。%2$s\n\n%3$s 工作階段顯示 零複製呈現 - 解析度 + 橫向解析度 + 直向解析度 + 跟隨橫向 (%1$d×%2$d) + 跟隨直向 (%1$d×%2$d) 16:9 遊戲顯示方式 16:9 遊戲如何配合此螢幕。下次工作階段生效。 請選擇「符合螢幕」或比 16:9 更窄的自訂尺寸。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 81d2a929e..b8e92e256 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2718,7 +2718,10 @@ %1$s. %2$s\n\n%3$s Session display Zero-copy presentation - Resolution + Landscape resolution + Portrait resolution + Follow landscape (%1$d×%2$d) + Follow portrait (%1$d×%2$d) 16:9 game fit How 16:9 games fit this display. Next session. Choose Match screen or a custom size that isn\'t 16:9. diff --git a/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt new file mode 100644 index 000000000..a589ac8be --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt @@ -0,0 +1,73 @@ +package com.droiddeck.launcher.session + +import android.content.Context +import org.junit.Assert.* +import org.junit.Before +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.RuntimeEnvironment +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28], manifest = Config.NONE) +class PortraitResolutionTest { + private val app get() = RuntimeEnvironment.getApplication() + private val panel = 2400 to 1080 + + @Before fun clear() { + app.getSharedPreferences("session", Context.MODE_PRIVATE).edit().clear().commit() + } + + @Test fun portraitFollowsLandscapeUntilItIsSet() { + assertEquals(SessionDisplay.LINK_LANDSCAPE, SessionPrefs.resolutionStored(app, "steam", panel, true)) + SessionPrefs.setResolutionChoice(app, "steam", "900p") + assertEquals("900p", SessionPrefs.resolutionChoice(app, "steam", panel, false)) + assertEquals("900p", SessionPrefs.resolutionChoice(app, "steam", panel, true)) + } + + @Test fun eachOrientationKeepsItsOwnResolution() { + SessionPrefs.setResolutionChoice(app, "steam", "1600x720") + SessionPrefs.setResolutionChoice(app, "steam", "1080p", portrait = true) + assertEquals("1600x720", SessionPrefs.resolutionChoice(app, "steam", panel, false)) + assertEquals("1080p", SessionPrefs.resolutionChoice(app, "steam", panel, true)) + assertEquals("1080p", SessionPrefs.resolutionStored(app, "steam", panel, true)) + } + + @Test fun landscapeCanFollowPortrait() { + SessionPrefs.setResolutionChoice(app, "steam", "720x1280", portrait = true) + SessionPrefs.setResolutionChoice(app, "steam", SessionDisplay.LINK_PORTRAIT) + assertEquals(SessionDisplay.LINK_PORTRAIT, SessionPrefs.resolutionStored(app, "steam", panel, false)) + assertEquals("1280x720", SessionPrefs.resolutionChoice(app, "steam", panel, false)) + assertEquals("720x1280", SessionPrefs.resolutionChoice(app, "steam", panel, true)) + } + + @Test fun followingEachOtherNeverLoops() { + SessionPrefs.setResolutionChoice(app, "steam", "900p") + SessionPrefs.setResolutionChoice(app, "steam", SessionDisplay.LINK_PORTRAIT) + assertEquals("900p", SessionPrefs.resolutionChoice(app, "steam", panel, false)) + assertEquals("900p", SessionPrefs.resolutionChoice(app, "steam", panel, true)) + assertFalse(SessionDisplay.isLink(SessionPrefs.resolutionStored(app, "steam", panel, true))) + } + + @Test fun modesKeepSeparateChoices() { + SessionPrefs.setResolutionChoice(app, "steam", "1080p", portrait = true) + assertEquals(SessionDisplay.LINK_LANDSCAPE, SessionPrefs.resolutionStored(app, "lxqt", panel, true)) + } + + @Test fun resettingSettingsClearsThePortraitChoice() { + SessionPrefs.setResolutionChoice(app, "steam", "1080p", portrait = true) + assertTrue(SettingsReset.isSessionSetting("displayResolution.portrait.steam")) + } + + @Test fun effectiveChoiceFollowsTheOtherOrientation() { + val d = SessionDisplay + assertEquals("900p", d.effectiveChoice("900p", d.LINK_LANDSCAPE, true)) + assertEquals("1600x720", d.effectiveChoice("1600x720", "1080p", false)) + assertEquals("720x1600", d.effectiveChoice("1600x720", d.LINK_LANDSCAPE, true)) + assertEquals("1600x720", d.effectiveChoice(d.LINK_PORTRAIT, "720x1600", false)) + assertEquals(d.DEFAULT_RESOLUTION, d.effectiveChoice(d.LINK_PORTRAIT, d.LINK_LANDSCAPE, true)) + assertEquals("follow/2", d.effectiveChoice("follow/2", d.LINK_LANDSCAPE, true)) + assertEquals(d.MATCH_SCREEN, d.effectiveChoice(d.LINK_PORTRAIT, d.MATCH_SCREEN, false)) + } +} From a9054aac3f45f134b2e091d3f9028f36ba944894 Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Sat, 21 Nov 2026 22:46:45 +0300 Subject: [PATCH 2/5] fix(session): address review on the landscape and portrait resolution split Accept generated portrait sizes on reload, use the right orientation and output target when deciding follow screen, show the real size behind each Follow option, treat a saved portrait Desktop resolution as chosen, and update the orientation hint in every locale. --- .../com/droiddeck/launcher/SessionActivity.kt | 16 ++++++++++++++-- .../droiddeck/launcher/session/SessionPrefs.kt | 10 +++++++--- .../droiddeck/launcher/ui/ModeSettingsDialog.kt | 8 ++++++-- .../com/droiddeck/launcher/ui/ResolutionRow.kt | 5 +++-- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-b+es+419/strings.xml | 2 +- app/src/main/res/values-bg/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-da/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-hu/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko/strings.xml | 2 +- app/src/main/res/values-ms/strings.xml | 2 +- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-th/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rHK/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- .../launcher/session/PortraitResolutionTest.kt | 15 +++++++++++++++ 38 files changed, 78 insertions(+), 42 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index bc4031946..6028afe1e 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2956,16 +2956,28 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde WaylandCompositor.nativeResizeOutput(size.first, size.second) } + private fun followPortrait(): Boolean { + if (glassesScreen != null) return false + if (::sessionRoot.isInitialized && sessionRoot.width > 0) return portraitOutput() + val portraitWindow = SessionPrefs.portrait(this) + val panel = com.droiddeck.launcher.session.SessionDisplay.panelSize(this) + val long = maxOf(panel.first, panel.second) + val short = minOf(panel.first, panel.second) + val below = SessionPrefs.controlsBelowWanted(this, intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM, + if (portraitWindow) short else long, if (portraitWindow) long else short) + return portraitWindow && !below + } + private fun followScale(): Float { val mode = displayMode() - val choice = SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), portraitOutput()) + val choice = SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), followPortrait()) return com.droiddeck.launcher.session.SessionDisplay.followScale(choice) ?: 1f } private fun followChoice(): Boolean { val mode = displayMode() return com.droiddeck.launcher.session.SessionDisplay.isFollow( - SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), portraitOutput())) + SessionPrefs.resolutionChoice(this, mode, com.droiddeck.launcher.session.SessionDisplay.panelSize(this), followPortrait())) } private fun applyFollowOrientation(config: android.content.res.Configuration) { 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 f243d3f31..87f28dc8e 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1310,9 +1310,13 @@ object SessionPrefs { val value = prefs(context).getString("displayResolution.portrait.$mode", null) ?: return SessionDisplay.LINK_LANDSCAPE if (value == SessionDisplay.LINK_LANDSCAPE || value == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(value) || SessionDisplay.presetHeight(value) != null) return value - return parseResolution(value)?.let { "${it.first}x${it.second}" } ?: SessionDisplay.LINK_LANDSCAPE + return parseOrientedResolution(value)?.let { "${it.first}x${it.second}" } ?: SessionDisplay.LINK_LANDSCAPE } + private fun parseOrientedResolution(text: String): Pair? = + parseResolution(text) ?: text.trim().split('x', 'X', '×', '*').takeIf { it.size == 2 } + ?.let { parseResolution("${it[1]}x${it[0]}") }?.let { it.second to it.first } + private fun landscapeResolutionStored(context: Context, mode: String, panel: Pair): String { val saved = prefs(context) saved.getString("displayResolution.$mode", null)?.let { value -> @@ -1332,7 +1336,7 @@ object SessionPrefs { val link = if (portrait) SessionDisplay.LINK_LANDSCAPE else SessionDisplay.LINK_PORTRAIT val value = if (choice == link || choice == SessionDisplay.MATCH_SCREEN || SessionDisplay.isFollow(choice) || SessionDisplay.presetHeight(choice) != null) choice else { - val size = requireNotNull(parseResolution(choice)) { "Invalid resolution" } + val size = requireNotNull(if (portrait) parseOrientedResolution(choice) else parseResolution(choice)) { "Invalid resolution" } "${size.first}x${size.second}" } val panel = SessionDisplay.panelSize(context) @@ -1982,7 +1986,7 @@ object SessionPrefs { 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 + (resolutionChosen(context, SessionService.MODE_DESKTOP) || resolutionChosen(context, SessionService.MODE_DESKTOP, true))) SessionService.MODE_DESKTOP else prefMode(mode) fun pipAutoEnter(context: Context): Boolean = prefs(context).getBoolean("pipAutoEnter", true) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 9d0933aa6..dda562a58 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -243,9 +243,13 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: val displaySize = sessionDisplay.resolveChoice(s.panelSize, activeChoice, portrait) SettingsGroup(stringResource(R.string.display_session)) { ResolutionRow(host, "resolution", stringResource(R.string.display_resolution_landscape), s.resolution, landscapeChoice, - com.droiddeck.launcher.session.SessionDisplay.LINK_PORTRAIT, s.panelSize, a.onResolution, portrait = false) + com.droiddeck.launcher.session.SessionDisplay.LINK_PORTRAIT, + if (sessionDisplay.isLink(s.resolutionPortrait)) landscapeChoice else sessionDisplay.orientCustom(s.resolutionPortrait, false), + s.panelSize, a.onResolution, portrait = false) ResolutionRow(host, "resolution-portrait", stringResource(R.string.display_resolution_portrait), s.resolutionPortrait, portraitChoice, - com.droiddeck.launcher.session.SessionDisplay.LINK_LANDSCAPE, s.panelSize, a.onResolutionPortrait, portrait = true) + com.droiddeck.launcher.session.SessionDisplay.LINK_LANDSCAPE, + if (sessionDisplay.isLink(s.resolution)) portraitChoice else sessionDisplay.orientCustom(s.resolution, true), + s.panelSize, a.onResolutionPortrait, portrait = true) s.picturePosition?.let { position -> ChoiceRow(host, "picture-position", stringResource(R.string.display_picture_position), null, listOf("top" to stringResource(R.string.display_position_top), diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt index efcbbc526..9a84adbe0 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt @@ -12,7 +12,7 @@ import com.droiddeck.launcher.session.SessionDisplay @Composable fun ResolutionRow( - host: MenuHost, id: String, title: String, stored: String, choice: String, link: String, + host: MenuHost, id: String, title: String, stored: String, choice: String, link: String, followTarget: String, panel: Pair, onPick: (String) -> Unit, chipModifier: Modifier = Modifier, portrait: Boolean = false, @@ -27,8 +27,9 @@ fun ResolutionRow( else if (size == screen) SessionDisplay.MATCH_SCREEN else choice var editCustom by remember { mutableStateOf(false) } var editFollow by remember { mutableStateOf(false) } + val followSize = SessionDisplay.resolveChoice(panel, followTarget, portrait) val linkLabel = stringResource(if (link == SessionDisplay.LINK_LANDSCAPE) R.string.display_follow_landscape else R.string.display_follow_portrait, - size.first, size.second) + followSize.first, followSize.second) val options = listOf(link to linkLabel) + choices.map { value -> val dimensions = SessionDisplay.resolveChoice(panel, value, portrait) value to if (value == SessionDisplay.MATCH_SCREEN) stringResource(R.string.display_match_screen, screen.first, screen.second) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b236ec795..32f76cd6d 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -964,7 +964,7 @@ اتّباع تدوير الجهاز عمودي اتجاه الجلسة - يُطبَّق على Steam والألعاب وسطح المكتب ومحرّر وحدة التحكم. تدور الدقّات المُعدّة مسبقًا مع الجلسة، ويبقى العرض والارتفاع المخصّصان كما أُدخلا. + يُطبَّق على Steam والألعاب وسطح المكتب ومحرّر وحدة التحكم. تدور الدقّات المُعدّة مسبقًا مع الجلسة، وعندما يتبع أحد الاتجاهين الآخر ينعكس العرض والارتفاع المخصّصان ليتطابقا. أفقي تلقائي أفقي أفقي معكوس diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index c1505584f..e0dda7fdc 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -982,7 +982,7 @@ Seguir la rotación del dispositivo Vertical Orientación de la sesión - Se aplica a Steam, los juegos, el escritorio y el editor de controles. Los ajustes predefinidos de resolución giran con la sesión; el ancho y el alto personalizados se mantienen como se ingresaron. + Se aplica a Steam, los juegos, el escritorio y el editor de controles. Los ajustes predefinidos de resolución giran con la sesión; cuando una orientación sigue a la otra, el ancho y el alto personalizados se invierten para coincidir. Horizontal automática Horizontal Horizontal invertida diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index dc9116e96..0fdc0b191 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -952,7 +952,7 @@ Следва завъртането на устройството Вертикална Ориентация на сесията - Прилага се за Steam, игрите, работния плот и редактора на контролера. Предварително зададените резолюции се завъртат със сесията; персонализираните ширина и височина остават както са въведени. + Прилага се за Steam, игрите, работния плот и редактора на контролера. Предварително зададените резолюции се завъртат със сесията; когато едната ориентация следва другата, персонализираните ширина и височина се разменят, за да съвпадат. Автоматичен хоризонтален Хоризонтална Обърната хоризонтална diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index d566a893f..59d74654f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -958,7 +958,7 @@ Podle otočení zařízení Na výšku Orientace relace - Platí pro Steam, hry, Plochu a editor ovladače. Předvolby rozlišení se otáčejí s relací; vlastní šířka a výška zůstávají, jak jsou zadány. + Platí pro Steam, hry, Plochu a editor ovladače. Předvolby rozlišení se otáčejí s relací; když jedna orientace sleduje druhou, vlastní šířka a výška se prohodí, aby odpovídaly. Automaticky na šířku Na šířku Na šířku obráceně diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index e1c48d2cc..9964a0631 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -952,7 +952,7 @@ Følg enhedens rotation Stående Sessionens retning - Gælder Steam, spil, skrivebordet og controllereditoren. Opløsningsforudindstillinger roterer med sessionen; brugerdefineret bredde og højde forbliver som angivet. + Gælder Steam, spil, skrivebordet og controllereditoren. Opløsningsforudindstillinger roterer med sessionen; når den ene orientering følger den anden, byttes brugerdefineret bredde og højde, så de passer. Automatisk liggende Liggende Omvendt liggende diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f986336c0..bcb221a12 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -944,7 +944,7 @@ Gerätedrehung folgen Hochformat Sitzungsausrichtung - Gilt für Steam, Spiele, Desktop und den Controller-Editor. Auflösungsvoreinstellungen drehen sich mit der Sitzung; eigene Breite und Höhe bleiben wie eingegeben. + Gilt für Steam, Spiele, Desktop und den Controller-Editor. Auflösungsvoreinstellungen drehen sich mit der Sitzung; folgt eine Ausrichtung der anderen, werden eigene Breite und Höhe passend vertauscht. Automatisch Querformat Querformat Umgekehrtes Querformat diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 47cddc9a9..f5bd31d63 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -952,7 +952,7 @@ Ακολουθεί την περιστροφή της συσκευής Κατακόρυφος Προσανατολισμός συνεδρίας - Ισχύει για το Steam, τα παιχνίδια, την επιφάνεια εργασίας και τον επεξεργαστή χειριστηρίου. Οι προκαθορισμένες αναλύσεις περιστρέφονται με τη συνεδρία· το προσαρμοσμένο πλάτος και ύψος μένουν όπως καταχωρίστηκαν. + Ισχύει για το Steam, τα παιχνίδια, την επιφάνεια εργασίας και τον επεξεργαστή χειριστηρίου. Οι προκαθορισμένες αναλύσεις περιστρέφονται με τη συνεδρία· όταν ένας προσανατολισμός ακολουθεί τον άλλον, το προσαρμοσμένο πλάτος και ύψος αντιστρέφονται ώστε να ταιριάζουν. Αυτόματος οριζόντιος προσανατολισμός Οριζόντιος προσανατολισμός Αντίστροφος οριζόντιος προσανατολισμός diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 637678281..47a00a843 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -955,7 +955,7 @@ Seguir la rotación del dispositivo Vertical Orientación de la sesión - Se aplica a Steam, los juegos, el escritorio y el editor de mandos. Los ajustes predefinidos de resolución giran con la sesión; el ancho y el alto personalizados se mantienen como se introdujeron. + Se aplica a Steam, los juegos, el escritorio y el editor de mandos. Los ajustes predefinidos de resolución giran con la sesión; cuando una orientación sigue a la otra, el ancho y el alto personalizados se invierten para coincidir. Horizontal automática Horizontal Horizontal invertida diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 47d447af2..64792a6d6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -952,7 +952,7 @@ Seuraa laitteen kiertoa Pystysuunta Istunnon suunta - Koskee Steamia, pelejä, työpöytää ja ohjainmuokkainta. Resoluution esiasetukset kääntyvät istunnon mukana; mukautettu leveys ja korkeus pysyvät syötetyn mukaisina. + Koskee Steamia, pelejä, työpöytää ja ohjainmuokkainta. Resoluution esiasetukset kääntyvät istunnon mukana; kun toinen suunta seuraa toista, mukautettu leveys ja korkeus vaihtavat paikkaa vastaamaan toisiaan. Automaattinen vaakasuunta Vaakasuunta Käänteinen vaakasuunta diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ae3d8f72b..ee7bbbb41 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -955,7 +955,7 @@ Suivre la rotation de l\'appareil Portrait Orientation de la session - S\'applique à Steam, aux jeux, au bureau et à l\'éditeur de manette. Les préréglages de résolution pivotent avec la session ; la largeur et la hauteur personnalisées restent telles que saisies. + S\'applique à Steam, aux jeux, au bureau et à l\'éditeur de manette. Les préréglages de résolution pivotent avec la session ; lorsqu\'une orientation suit l\'autre, la largeur et la hauteur personnalisées sont inversées pour correspondre. Paysage automatique Paysage Paysage inversé diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 109385a8e..be2c9d973 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -952,7 +952,7 @@ डिवाइस रोटेशन के अनुसार पोर्ट्रेट सेशन ओरिएंटेशन - Steam, गेम, डेस्कटॉप और कंट्रोलर एडिटर पर लागू होता है। रिज़ॉल्यूशन प्रीसेट सेशन के साथ घूमते हैं; कस्टम चौड़ाई और ऊंचाई जैसी डाली गई वैसी ही रहती हैं। + Steam, गेम, डेस्कटॉप और कंट्रोलर एडिटर पर लागू होता है। रिज़ॉल्यूशन प्रीसेट सेशन के साथ घूमते हैं; जब एक ओरिएंटेशन दूसरे को फ़ॉलो करता है, तो कस्टम चौड़ाई और ऊंचाई बदलकर मेल खाती हैं। ऑटोमैटिक लैंडस्केप लैंडस्केप उलटा लैंडस्केप diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index d512c7256..2cb432d71 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -952,7 +952,7 @@ Az eszköz elforgatásának követése Álló Munkamenet tájolása - A Steamre, a játékokra, az asztalra és a kontrollerszerkesztőre vonatkozik. A felbontás-előbeállítások a munkamenettel együtt forognak; az egyéni szélesség és magasság a megadott módon marad. + A Steamre, a játékokra, az asztalra és a kontrollerszerkesztőre vonatkozik. A felbontás-előbeállítások a munkamenettel együtt forognak; ha az egyik tájolás a másikat követi, az egyéni szélesség és magasság felcserélődik. Automatikus fekvő Fekvő Fordított fekvő diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index 1f36e3553..c8449cb38 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -949,7 +949,7 @@ Ikuti rotasi perangkat Potret Orientasi sesi - Berlaku untuk Steam, gim, desktop, dan editor pengontrol. Preset resolusi ikut berputar dengan sesi; lebar dan tinggi kustom tetap seperti yang dimasukkan. + Berlaku untuk Steam, gim, desktop, dan editor pengontrol. Preset resolusi ikut berputar dengan sesi; saat satu orientasi mengikuti yang lain, lebar dan tinggi kustom ditukar agar sesuai. Lanskap otomatis Lanskap Lanskap terbalik diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d41da79a4..51f13aee7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -947,7 +947,7 @@ Segui la rotazione del dispositivo Verticale Orientamento della sessione - Si applica a Steam, ai giochi, al desktop e all\'editor del controller. I preset di risoluzione ruotano con la sessione; larghezza e altezza personalizzate restano come inserite. + Si applica a Steam, ai giochi, al desktop e all\'editor del controller. I preset di risoluzione ruotano con la sessione; quando un\'orientamento segue l\'altro, larghezza e altezza personalizzate vengono invertite per corrispondere. Orizzontale automatico Orizzontale Orizzontale invertito diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 130ef4445..ea088f306 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -949,7 +949,7 @@ デバイスの回転に合わせる 縦向き セッションの向き - Steam、ゲーム、デスクトップ、コントローラーエディターに適用されます。解像度プリセットはセッションに合わせて回転し、カスタムの幅と高さは入力したとおりになります。 + Steam、ゲーム、デスクトップ、コントローラーエディターに適用されます。解像度プリセットはセッションに合わせて回転し、一方の向きがもう一方に従う場合、カスタムの幅と高さは向きに合わせて入れ替わります。 横向き(自動回転) 横向き 横向き(反転) diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 267eff113..96ee8f2ab 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -949,7 +949,7 @@ 기기 회전 따르기 세로 세션 방향 - Steam, 게임, 데스크톱 및 컨트롤러 편집기에 적용됩니다. 해상도 프리셋은 세션에 맞춰 회전하며, 사용자 정의 너비와 높이는 입력한 그대로 유지됩니다. + Steam, 게임, 데스크톱 및 컨트롤러 편집기에 적용됩니다. 해상도 프리셋은 세션에 맞춰 회전하며, 한 방향이 다른 방향을 따를 때 사용자 정의 너비와 높이는 방향에 맞게 서로 바뀝니다. 자동 가로 모드 가로 모드 역방향 가로 모드 diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index ccfcb1b69..0ad66431a 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -949,7 +949,7 @@ Ikut putaran peranti Potret Orientasi sesi - Berkuat kuasa pada Steam, permainan, desktop dan editor pengawal. Pratetap resolusi berputar bersama sesi; lebar dan tinggi tersuai kekal seperti yang dimasukkan. + Berkuat kuasa pada Steam, permainan, desktop dan editor pengawal. Pratetap resolusi berputar bersama sesi; apabila satu orientasi mengikuti yang lain, lebar dan tinggi tersuai ditukar supaya sepadan. Lanskap automatik Lanskap Lanskap songsang diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index d9d6d76a6..9f2085f5e 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -952,7 +952,7 @@ Følg enhetens rotasjon Stående Retning for sesjonen - Gjelder Steam, spill, skrivebordet og kontrollerredigeringen. Forhåndsinnstilte oppløsninger roterer med sesjonen; egendefinert bredde og høyde forblir som angitt. + Gjelder Steam, spill, skrivebordet og kontrollerredigeringen. Forhåndsinnstilte oppløsninger roterer med sesjonen; når én retning følger den andre, byttes egendefinert bredde og høyde slik at de passer. Automatisk liggende Liggende Omvendt liggende diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 0f3ba678f..9e00bc86e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -952,7 +952,7 @@ Apparaatrotatie volgen Staand Oriëntatie van sessie - Geldt voor Steam, games, desktop en de controllereditor. Resolutievoorinstellingen draaien mee met de sessie; aangepaste breedte en hoogte blijven zoals ingevoerd. + Geldt voor Steam, games, desktop en de controllereditor. Resolutievoorinstellingen draaien mee met de sessie; als de ene oriëntatie de andere volgt, worden aangepaste breedte en hoogte omgewisseld. Automatisch liggend Liggend Liggend omgekeerd diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 85b3ed455..25768ef8f 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -958,7 +958,7 @@ Zgodnie z obrotem urządzenia Pionowa Orientacja sesji - Dotyczy Steam, gier, pulpitu i edytora kontrolera. Presety rozdzielczości obracają się z sesją; własna szerokość i wysokość pozostają jak wpisano. + Dotyczy Steam, gier, pulpitu i edytora kontrolera. Presety rozdzielczości obracają się z sesją; gdy jedna orientacja podąża za drugą, własna szerokość i wysokość są zamieniane. Automatyczna pozioma Pozioma Odwrócona pozioma diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 44e3b263b..51ea15786 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -947,7 +947,7 @@ Seguir a rotação do dispositivo Vertical Orientação da sessão - Aplica-se ao Steam, aos jogos, ao ambiente de trabalho e ao editor de comandos. As predefinições de resolução rodam com a sessão; a largura e a altura personalizadas ficam como foram introduzidas. + Aplica-se ao Steam, aos jogos, ao ambiente de trabalho e ao editor de comandos. As predefinições de resolução rodam com a sessão; quando uma orientação segue a outra, a largura e a altura personalizadas são trocadas para corresponder. Horizontal automática Horizontal Horizontal invertida diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index f74544621..c10d3cfa7 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -954,7 +954,7 @@ Seguir a rotação do dispositivo Retrato Orientação da sessão - Vale para a Steam, os jogos, a área de trabalho e o editor de controle. As predefinições de resolução giram com a sessão; largura e altura personalizadas ficam como foram digitadas. + Vale para a Steam, os jogos, a área de trabalho e o editor de controle. As predefinições de resolução giram com a sessão; quando uma orientação segue a outra, largura e altura personalizadas são trocadas para corresponder. Paisagem automática Paisagem Paisagem invertida diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index b43faecae..e74bec3b8 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -955,7 +955,7 @@ Urmează rotirea dispozitivului Portret Orientarea sesiunii - Se aplică pentru Steam, jocuri, desktop și editorul de controller. Presetările de rezoluție se rotesc odată cu sesiunea; lățimea și înălțimea personalizate rămân cum au fost introduse. + Se aplică pentru Steam, jocuri, desktop și editorul de controller. Presetările de rezoluție se rotesc odată cu sesiunea; când o orientare o urmează pe cealaltă, lățimea și înălțimea personalizate se inversează pentru a se potrivi. Peisaj automat Peisaj Peisaj inversat diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4de7f5cac..de792927e 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -958,7 +958,7 @@ Следовать повороту устройства Портретная Ориентация сессии - Применяется к Steam, играм, рабочему столу и редактору контроллера. Предустановки разрешения поворачиваются вместе с сессией; свои ширина и высота остаются как введены. + Применяется к Steam, играм, рабочему столу и редактору контроллера. Предустановки разрешения поворачиваются вместе с сессией; когда одна ориентация следует за другой, свои ширина и высота меняются местами. Альбомная (авто) Альбомная Перевернутая альбомная diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e8b824c9c..8e951147a 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -952,7 +952,7 @@ Följ enhetens rotation Stående Sessionens orientering - Gäller Steam, spel, skrivbordet och kontrollredigeraren. Upplösningsförinställningar roterar med sessionen; anpassad bredd och höjd förblir som angivet. + Gäller Steam, spel, skrivbordet och kontrollredigeraren. Upplösningsförinställningar roterar med sessionen; när en orientering följer den andra byts anpassad bredd och höjd så att de passar. Automatiskt liggande Liggande Liggande, upp och ned diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 34d772a59..1a826fcb2 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -949,7 +949,7 @@ หมุนตามอุปกรณ์ แนวตั้ง การวางแนวของเซสชัน - มีผลกับ Steam เกม เดสก์ท็อป และตัวแก้ไขคอนโทรลเลอร์ ค่าความละเอียดที่ตั้งไว้ล่วงหน้าจะหมุนตามเซสชัน ส่วนความกว้างและความสูงที่กำหนดเองจะคงตามที่ป้อนไว้ + มีผลกับ Steam เกม เดสก์ท็อป และตัวแก้ไขคอนโทรลเลอร์ ค่าความละเอียดที่ตั้งไว้ล่วงหน้าจะหมุนตามเซสชัน เมื่อแนวหนึ่งตามอีกแนวหนึ่ง ความกว้างและความสูงที่กำหนดเองจะสลับกันให้ตรงกัน แนวนอนอัตโนมัติ แนวนอน แนวนอนกลับด้าน diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 725a568c1..3644798c4 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -944,7 +944,7 @@ Cihaz dönüşünü izle Dikey Oturum yönü - Steam, oyunlar, masaüstü ve kumanda düzenleyicisi için geçerlidir. Çözünürlük ön ayarları oturumla birlikte döner; özel genişlik ve yükseklik girildiği gibi kalır. + Steam, oyunlar, masaüstü ve kumanda düzenleyicisi için geçerlidir. Çözünürlük ön ayarları oturumla birlikte döner; bir yön diğerini izlediğinde özel genişlik ve yükseklik eşleşmek üzere yer değiştirir. Otomatik yatay Yatay Ters yatay diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cf0594346..6f67409b1 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -958,7 +958,7 @@ Слідувати повороту пристрою Книжкова Орієнтація сеансу - Застосовується до Steam, ігор, робочого столу й редактора контролера. Готові роздільні здатності повертаються разом із сеансом; власні ширина й висота залишаються як введено. + Застосовується до Steam, ігор, робочого столу й редактора контролера. Готові роздільні здатності повертаються разом із сеансом; коли одна орієнтація слідує за іншою, власні ширина й висота міняються місцями. Автоматично альбомна Альбомна Перевернута альбомна diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 290bf2b03..5c5d7e407 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -949,7 +949,7 @@ Theo hướng xoay thiết bị Dọc Hướng màn hình phiên - Áp dụng cho Steam, game, desktop và trình chỉnh sửa tay cầm. Độ phân giải đặt sẵn xoay theo phiên; chiều rộng và chiều cao tùy chỉnh giữ nguyên như đã nhập. + Áp dụng cho Steam, game, desktop và trình chỉnh sửa tay cầm. Độ phân giải đặt sẵn xoay theo phiên; khi một hướng theo hướng còn lại, chiều rộng và chiều cao tùy chỉnh được hoán đổi cho khớp. Ngang tự động Ngang Ngang ngược diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 70cda7d67..1d181502b 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -949,7 +949,7 @@ 跟随设备旋转 竖屏 会话方向 - 适用于 Steam、游戏、桌面和手柄编辑器。分辨率预设会随会话旋转;自定义宽度和高度保持输入值不变。 + 适用于 Steam、游戏、桌面和手柄编辑器。分辨率预设会随会话旋转;当一个方向跟随另一个方向时,自定义宽度和高度会互换以保持一致。 自动横屏 横屏 反向横屏 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 93608c774..a4d0cca3f 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -948,7 +948,7 @@ 跟隨裝置旋轉 直向 會話方向 - 套用至 Steam、遊戲、桌面和控制器編輯器。解像度預設會隨會話旋轉;自訂的寬度和高度則維持輸入值。 + 套用至 Steam、遊戲、桌面和控制器編輯器。解像度預設會隨會話旋轉;當一個方向跟隨另一個方向時,自訂的寬度和高度會互換以保持一致。 自動橫向 橫向 反向橫向 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 5a8eaf443..b0462383c 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -948,7 +948,7 @@ 跟隨裝置旋轉 直向 工作階段方向 - 套用至 Steam、遊戲、桌面和控制器編輯器。解析度預設會隨工作階段旋轉;自訂的寬度和高度則維持輸入值。 + 套用至 Steam、遊戲、桌面和控制器編輯器。解析度預設會隨工作階段旋轉;當一個方向跟隨另一個方向時,自訂的寬度和高度會互換以保持一致。 自動橫向 橫向 反向橫向 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b8e92e256..b6e0aca8e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1025,7 +1025,7 @@ Follow device rotation Portrait Session orientation - Applies to Steam, games, desktop, and the controller editor. Resolution presets rotate with the session; custom width and height stay as entered. + Applies to Steam, games, desktop, and the controller editor. Resolution presets rotate with the session; when one orientation follows the other, custom width and height flip to match. Automatic landscape Landscape Reverse landscape diff --git a/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt index a589ac8be..503e26086 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt @@ -50,6 +50,21 @@ class PortraitResolutionTest { assertFalse(SessionDisplay.isLink(SessionPrefs.resolutionStored(app, "steam", panel, true))) } + @Test fun aGeneratedPortraitSizeSurvivesAReload() { + SessionPrefs.setResolutionChoice(app, "steam", "2560x1440") + SessionPrefs.setResolutionChoice(app, "steam", SessionDisplay.LINK_PORTRAIT) + assertEquals("1440x2560", SessionPrefs.resolutionStored(app, "steam", panel, true)) + assertEquals("2560x1440", SessionPrefs.resolutionChoice(app, "steam", panel, false)) + assertEquals("1440x2560", SessionPrefs.resolutionChoice(app, "steam", panel, true)) + } + + @Test fun aSavedDesktopResolutionInEitherOrientationCountsAsChosen() { + SessionPrefs.setResolutionChoice(app, SessionService.MODE_DESKTOP, "1080p", portrait = true) + assertTrue(SessionPrefs.resolutionChosen(app, SessionService.MODE_DESKTOP, true)) + assertEquals(SessionService.MODE_DESKTOP, + SessionPrefs.displayMode(app, SessionService.MODE_RUN, com.droiddeck.launcher.runtime.UserApps.SCRIPT_LAUNCHER)) + } + @Test fun modesKeepSeparateChoices() { SessionPrefs.setResolutionChoice(app, "steam", "1080p", portrait = true) assertEquals(SessionDisplay.LINK_LANDSCAPE, SessionPrefs.resolutionStored(app, "lxqt", panel, true)) From 567181d05fe2637fc87a07d46ca4216ab010fcf5 Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Sat, 21 Nov 2026 22:56:29 +0300 Subject: [PATCH 3/5] fix(session): let the portrait custom resolution dialog accept tall sizes --- .../java/com/droiddeck/launcher/session/SessionPrefs.kt | 2 +- .../java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt | 4 ++-- .../main/java/com/droiddeck/launcher/ui/ResolutionRow.kt | 2 +- .../droiddeck/launcher/session/PortraitResolutionTest.kt | 9 +++++++++ 4 files changed, 13 insertions(+), 4 deletions(-) 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 87f28dc8e..c3ce0da60 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -1313,7 +1313,7 @@ object SessionPrefs { return parseOrientedResolution(value)?.let { "${it.first}x${it.second}" } ?: SessionDisplay.LINK_LANDSCAPE } - private fun parseOrientedResolution(text: String): Pair? = + fun parseOrientedResolution(text: String): Pair? = parseResolution(text) ?: text.trim().split('x', 'X', '×', '*').takeIf { it.size == 2 } ?.let { parseResolution("${it[1]}x${it[0]}") }?.let { it.second to it.first } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index dda562a58..3218579f8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -720,10 +720,10 @@ internal fun SgdbKeyDialog(hasKey: Boolean, onSave: (String) -> Unit, onDismiss: @OptIn(androidx.compose.foundation.layout.ExperimentalLayoutApi::class) @Composable -internal fun CustomResolutionDialog(initial: Pair?, onSave: (Pair) -> Unit, onDismiss: () -> Unit) { +internal fun CustomResolutionDialog(initial: Pair?, onSave: (Pair) -> Unit, onDismiss: () -> Unit, portrait: Boolean = false) { var w by remember { mutableStateOf(initial?.first?.toString() ?: "") } var h by remember { mutableStateOf(initial?.second?.toString() ?: "") } - val parsed = SessionPrefs.parseResolution("${w}x$h") + val parsed = if (portrait) SessionPrefs.parseOrientedResolution("${w}x$h") else SessionPrefs.parseResolution("${w}x$h") com.droiddeck.launcher.ui.GlideAlertDialog( onDismissRequest = onDismiss, title = { Text(stringResource(R.string.mode_custom_res_title)) }, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt index 9a84adbe0..ca9ca5976 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ResolutionRow.kt @@ -51,7 +51,7 @@ fun ResolutionRow( else onPick(value) }) if (editCustom) CustomResolutionDialog(size, onSave = { value -> editCustom = false; onPick("${value.first}x${value.second}") }, - onDismiss = { editCustom = false }) + onDismiss = { editCustom = false }, portrait = portrait) if (editFollow) CustomFollowScaleDialog(SessionDisplay.followScale(choice)?.takeIf { it > 1f }, onSave = { value -> editFollow = false; onPick(SessionDisplay.followScaled(value)) }, onDismiss = { editFollow = false }) diff --git a/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt b/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt index 503e26086..fb9199157 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/PortraitResolutionTest.kt @@ -65,6 +65,15 @@ class PortraitResolutionTest { SessionPrefs.displayMode(app, SessionService.MODE_RUN, com.droiddeck.launcher.runtime.UserApps.SCRIPT_LAUNCHER)) } + @Test fun portraitInputAcceptsTallSizesLandscapeInputDoesNot() { + assertNull(SessionPrefs.parseResolution("1440x2560")) + assertEquals(1440 to 2560, SessionPrefs.parseOrientedResolution("1440x2560")) + assertEquals(1280 to 720, SessionPrefs.parseOrientedResolution("1280x720")) + assertNull(SessionPrefs.parseOrientedResolution("100x100")) + SessionPrefs.setResolutionChoice(app, "steam", "1440x2560", portrait = true) + assertEquals("1440x2560", SessionPrefs.resolutionStored(app, "steam", panel, true)) + } + @Test fun modesKeepSeparateChoices() { SessionPrefs.setResolutionChoice(app, "steam", "1080p", portrait = true) assertEquals(SessionDisplay.LINK_LANDSCAPE, SessionPrefs.resolutionStored(app, "lxqt", panel, true)) From 0399c3e51020f10f4a6d057ec41f1830cb1b609c Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Sat, 21 Nov 2026 23:50:19 +0300 Subject: [PATCH 4/5] Use the portrait resolution in the controls-below layout and size the game area to the output aspect --- .../com/droiddeck/launcher/SessionActivity.kt | 26 ++++++------------- .../launcher/session/SessionDisplay.kt | 8 ++++-- .../launcher/ui/ModeSettingsDialog.kt | 2 +- .../launcher/session/SessionDisplayTest.kt | 5 ++++ 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 6028afe1e..205814127 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -2956,17 +2956,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde WaylandCompositor.nativeResizeOutput(size.first, size.second) } - private fun followPortrait(): Boolean { - if (glassesScreen != null) return false - if (::sessionRoot.isInitialized && sessionRoot.width > 0) return portraitOutput() - val portraitWindow = SessionPrefs.portrait(this) - val panel = com.droiddeck.launcher.session.SessionDisplay.panelSize(this) - val long = maxOf(panel.first, panel.second) - val short = minOf(panel.first, panel.second) - val below = SessionPrefs.controlsBelowWanted(this, intent.getStringExtra(SessionService.EXTRA_MODE) ?: SessionService.MODE_STEAM, - if (portraitWindow) short else long, if (portraitWindow) long else short) - return portraitWindow && !below - } + private fun followPortrait(): Boolean = glassesScreen == null && SessionPrefs.portrait(this) private fun followScale(): Float { val mode = displayMode() @@ -3045,13 +3035,11 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun portraitOutput(): Boolean = SessionPrefs.portrait(this) && !controlsBelowWanted() - private fun outputSize(): Pair { - val portrait = portraitOutput() - return com.droiddeck.launcher.session.SessionDisplay.resolveChoice(com.droiddeck.launcher.session.SessionDisplay.panelSize(this), - resolutionChoice(portrait), portrait) - } + private fun outputSize(): Pair = + com.droiddeck.launcher.session.SessionDisplay.resolveChoice(com.droiddeck.launcher.session.SessionDisplay.panelSize(this), + resolutionChoice(), portraitOutput()) - private fun resolutionChoice(portrait: Boolean = portraitOutput()): String { + private fun resolutionChoice(portrait: Boolean = SessionPrefs.portrait(this)): String { val mode = displayMode() val program = intent.getStringExtra(SessionService.EXTRA_PROGRAM) return if (intent.getStringExtra(SessionService.EXTRA_MODE) == SessionService.MODE_RUN && @@ -4636,7 +4624,9 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde val tabRow = unfoldedColumn?.getChildAt(0)?.height?.let { it - (com.droiddeck.launcher.ui.BAR_HEIGHT.value * resources.displayMetrics.density + 0.5f).toInt() } ?: 0 - val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height, tabRow) + val outputAspect = if (!wanted || SessionState.followScreen) 0f + else outputSize().let { it.first.toFloat() / it.second.coerceAtLeast(1) } + val gameHeight = if (wanted) com.droiddeck.launcher.session.SessionDisplay.unfoldedGameHeight(width, height, tabRow, outputAspect) else FrameLayout.LayoutParams.MATCH_PARENT val params = surfaceView.layoutParams as FrameLayout.LayoutParams if (params.height != gameHeight) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt index a9f809c07..919891fa4 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionDisplay.kt @@ -89,8 +89,12 @@ object SessionDisplay { const val UNFOLDED_MIN_DP = 600 - fun unfoldedGameHeight(width: Int, height: Int, tabRow: Int = 0): Int = - (minOf(width * 9 / 16, (height * UNFOLDED_MAX_GAME_SHARE).toInt()) - tabRow.coerceAtLeast(0)).coerceAtLeast(0) and 1.inv() + fun unfoldedGameHeight(width: Int, height: Int, tabRow: Int = 0, aspect: Float = 0f): Int { + val row = tabRow.coerceAtLeast(0) + val cap = (height * UNFOLDED_MAX_GAME_SHARE).toInt() + if (aspect > 0f && aspect < 16f / 9f) return minOf((width / aspect).toInt(), cap - row).coerceAtLeast(0) and 1.inv() + return (minOf(width * 9 / 16, cap) - row).coerceAtLeast(0) and 1.inv() + } fun unfoldedControlsWanted( enabled: Boolean, diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 3218579f8..fc611d6ca 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -239,7 +239,7 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: val sessionDisplay = com.droiddeck.launcher.session.SessionDisplay val landscapeChoice = sessionDisplay.effectiveChoice(s.resolution, s.resolutionPortrait, false) val portraitChoice = sessionDisplay.effectiveChoice(s.resolution, s.resolutionPortrait, true) - val activeChoice = if (portrait) portraitChoice else landscapeChoice + val activeChoice = if (portraitWindow) portraitChoice else landscapeChoice val displaySize = sessionDisplay.resolveChoice(s.panelSize, activeChoice, portrait) SettingsGroup(stringResource(R.string.display_session)) { ResolutionRow(host, "resolution", stringResource(R.string.display_resolution_landscape), s.resolution, landscapeChoice, diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt index 1835b6b85..28fc21d54 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt @@ -55,6 +55,11 @@ class SessionDisplayTest { @Test fun unfoldedControlsKeepTheGameSixteenByNineAcrossTheWidth() { assertEquals(606, SessionDisplay.unfoldedGameHeight(1080, 1920)) + assertEquals(606, SessionDisplay.unfoldedGameHeight(1080, 1920, 0, 16f / 9f)) + assertEquals(606, SessionDisplay.unfoldedGameHeight(1080, 1920, 0, 2.2f)) + assertEquals(1080, SessionDisplay.unfoldedGameHeight(1440, 3039, 192, 4f / 3f)) + assertEquals(1080, SessionDisplay.unfoldedGameHeight(1440, 3039, 0, 4f / 3f)) + assertEquals(2238, SessionDisplay.unfoldedGameHeight(1440, 3039, 0, 0.5f)) assertEquals(1376, SessionDisplay.unfoldedGameHeight(2448, 1848)) assertEquals(1038, SessionDisplay.unfoldedGameHeight(1848, 2448)) assertEquals(864, SessionDisplay.unfoldedGameHeight(1920, 1080)) From 86226910c36a794ed4b287ceea617ce07ff4e2bf Mon Sep 17 00:00:00 2001 From: FX192 <120828496+FX192@users.noreply.github.com> Date: Sun, 22 Nov 2026 00:09:51 +0300 Subject: [PATCH 5/5] Correct the tall-aspect game height expectation in the test --- .../java/com/droiddeck/launcher/session/SessionDisplayTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt index 28fc21d54..f8dd6e34e 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/SessionDisplayTest.kt @@ -59,7 +59,7 @@ class SessionDisplayTest { assertEquals(606, SessionDisplay.unfoldedGameHeight(1080, 1920, 0, 2.2f)) assertEquals(1080, SessionDisplay.unfoldedGameHeight(1440, 3039, 192, 4f / 3f)) assertEquals(1080, SessionDisplay.unfoldedGameHeight(1440, 3039, 0, 4f / 3f)) - assertEquals(2238, SessionDisplay.unfoldedGameHeight(1440, 3039, 0, 0.5f)) + assertEquals(2430, SessionDisplay.unfoldedGameHeight(1440, 3039, 0, 0.5f)) assertEquals(1376, SessionDisplay.unfoldedGameHeight(2448, 1848)) assertEquals(1038, SessionDisplay.unfoldedGameHeight(1848, 2448)) assertEquals(864, SessionDisplay.unfoldedGameHeight(1920, 1080))