From acc04bfabbed940a4943c1febd27271695a15b29 Mon Sep 17 00:00:00 2001 From: The412Banner Date: Wed, 23 Sep 2026 15:57:19 -0400 Subject: [PATCH] Driver pages: back returns to where you left the settings page Backing out of the Runtime or Display driver page rebuilt the session's settings page from the top with nothing focused. Its scroll position is now held above the page (SettingsPage takes an optional ScrollState) and survives the driver page, and controller focus returns to the driver box that was pressed to open it (ValueChip takes a modifier for its FocusRequester). --- .../launcher/ui/ModeSettingsDialog.kt | 26 +++++++++++++++++-- .../steamdeck/launcher/ui/SettingsWidgets.kt | 9 ++++--- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt index 354f09a2e3..00b6b64bc6 100644 --- a/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/steamdeck/launcher/ui/ModeSettingsDialog.kt @@ -11,6 +11,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.steamdeck.launcher.core.FexPreset @@ -111,7 +112,21 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { val steam = s.mode == SessionService.MODE_STEAM val host = rememberMenuHost() // The two driver lists open as full pages over this one ("rt" = runtime, "panel" = display). + // Coming back restores this page as it was left: the same scroll position, and controller focus + // on the driver box that opened the page. var driverPage by remember { mutableStateOf(null) } + var returnTo by remember { mutableStateOf(null) } + val pageScroll = androidx.compose.foundation.rememberScrollState() + val runtimeChip = remember { androidx.compose.ui.focus.FocusRequester() } + val displayChip = remember { androidx.compose.ui.focus.FocusRequester() } + fun openDriverPage(key: String) { returnTo = key; driverPage = key } + androidx.compose.runtime.LaunchedEffect(driverPage) { + if (driverPage == null) returnTo?.let { key -> + // One frame first: the box has to be laid out again before it can take focus. + androidx.compose.runtime.withFrameNanos { } + runCatching { (if (key == "rt") runtimeChip else displayChip).requestFocus() } + } + } when (driverPage) { "rt" -> { DriverPage( @@ -142,6 +157,7 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { host, title = if (steam) "Steam session" else "Desktop session", onBack = a.onDismiss, + scroll = pageScroll, ) { SettingsGroup("Display") { val default = SessionPrefs.defaultResolutionCap(s.mode) @@ -176,10 +192,16 @@ fun ModeSettingsPage(s: ModeSettings, a: ModeSettingsActions) { } SettingsGroup("Drivers") { SettingsRow("Runtime driver", (if (steam) "Used by Steam and games." else "Used by desktop apps.") + " Applies next session.") { - ValueChip(s.linuxRows.firstOrNull { it.id == s.linuxSelected }?.name ?: "Runtime default", open = false) { driverPage = "rt" } + ValueChip( + s.linuxRows.firstOrNull { it.id == s.linuxSelected }?.name ?: "Runtime default", open = false, + modifier = androidx.compose.ui.Modifier.focusRequester(runtimeChip), + ) { openDriverPage("rt") } } SettingsRow("Display driver", "Used by the compositor in both modes. Restart the app to apply.") { - ValueChip(s.androidRows.firstOrNull { it.id == s.androidSelected }?.name ?: "Auto - picked by GPU", open = false) { driverPage = "panel" } + ValueChip( + s.androidRows.firstOrNull { it.id == s.androidSelected }?.name ?: "Auto - picked by GPU", open = false, + modifier = androidx.compose.ui.Modifier.focusRequester(displayChip), + ) { openDriverPage("panel") } } } SettingsGroup(if (steam) "Touch & controls" else "Touch") { diff --git a/app/src/main/java/com/steamdeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/steamdeck/launcher/ui/SettingsWidgets.kt index 333009fc3d..1820b70af6 100644 --- a/app/src/main/java/com/steamdeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/steamdeck/launcher/ui/SettingsWidgets.kt @@ -165,7 +165,7 @@ fun MenuItem( } @Composable -fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, onClick: () -> Unit) { +fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, modifier: Modifier = Modifier, onClick: () -> Unit) { val colors = MaterialTheme.colorScheme val src = remember { MutableInteractionSource() } val hot = src.collectIsFocusedAsState().value || src.collectIsHoveredAsState().value @@ -174,7 +174,7 @@ fun ValueChip(text: String, open: Boolean, enabled: Boolean = true, onClick: () val rot by animateFloatAsState(if (open) 180f else 0f, Motion.sp(0.6f), label = "chipCaret") Row( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween, - modifier = Modifier + modifier = modifier .widthIn(min = 150.dp) .clip(RoundedCornerShape(10.dp)) .background(colors.surfaceVariant) @@ -282,8 +282,11 @@ fun SettingsPage( lede: String? = null, /** A small control at the right of the title (the driver pages' refresh button). */ action: (@Composable () -> Unit)? = null, + /** Pass one held above the page to keep its scroll position across a page opened over it. */ + scroll: androidx.compose.foundation.ScrollState? = null, content: @Composable ColumnScope.() -> Unit, ) { + val scrollState = scroll ?: rememberScrollState() val colors = MaterialTheme.colorScheme val dim by animateFloatAsState(if (host.open != null) 0.6f else 1f, Motion.tw(220), label = "pageDim") Column(modifier = Modifier.fillMaxSize().padding(horizontal = 22.dp, vertical = 18.dp)) { @@ -314,7 +317,7 @@ fun SettingsPage( } if (lede != null) Rise(2) { Lede(lede) } Rise(3, Modifier.weight(1f).fillMaxWidth()) { - Column(modifier = Modifier.fillMaxSize().graphicsLayer { alpha = dim }.verticalScroll(rememberScrollState()).padding(bottom = 24.dp)) { content() } + Column(modifier = Modifier.fillMaxSize().graphicsLayer { alpha = dim }.verticalScroll(scrollState).padding(bottom = 24.dp)) { content() } } } }