Remove redundant in-session Desktop button (#188)

This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-10-03 23:00:02 -04:00
1 parent e7b6876877
commit eb9ca4ab6b
2 files changed
+2 -22

No files matched your search

@@ -493,16 +493,6 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
onHardwareKeyboard = { drawerOpen = false; pcKeyboardOpen = !pcKeyboardOpen },
onSteamMenu = if (SessionState.mode == SessionService.MODE_STEAM) ({ sendSteamGuide() }) else null,
onQam = if (SessionState.mode == SessionService.MODE_STEAM) ({ triggerSteamQam() }) else null,
// The desktop with Steam's desktop client in it, in this session's place: the
// session ends with status 0 and onSessionEnded starts the relaunch (Stop's
// finish() would skip it).
onSwitchToDesktop = if (SessionState.mode == SessionService.MODE_STEAM) ({
drawerOpen = false
SessionState.relaunch = Intent(this@SessionActivity, SessionActivity::class.java)
.putExtra(SessionService.EXTRA_MODE, SessionService.MODE_DESKTOP)
.putExtra(SessionService.EXTRA_STEAM_UI, "desktop")
SessionService.stop(this@SessionActivity)
}) else null,
backActionsInverted = backActionsInverted,
onBackActionsInverted = { inverted ->
SessionPrefs.setBackActionsInverted(this@SessionActivity, inverted)
@@ -1083,8 +1073,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
if (status == 0) {
runOnUiThread {
if (isFinishing || isDestroyed) return@runOnUiThread
// A session asked for in this one's place (the desktop's Steam launchers, the
// drawer's DESKTOP) starts here: this activity restarts on its intent, as an agent
// A session asked for in this one's place (the desktop's Steam launchers or
// Steam's Switch to Desktop) starts here: this activity restarts on its intent, as an agent
// start does. startActivity(next) could not do it - the activity is singleTop, so
// the request landed in this instance's onNewIntent and went with its finish().
SessionState.relaunch?.let { next ->
@@ -185,8 +185,6 @@ class DrawerActions(
val onHardwareKeyboard: () -> Unit,
val onSteamMenu: (() -> Unit)?,
val onQam: (() -> Unit)?,
/** Steam sessions: end Big Picture and open the desktop with Steam's desktop client in it. */
val onSwitchToDesktop: (() -> Unit)? = null,
val onOsc: (String) -> Unit,
val onSuspendPolicy: (String) -> Unit,
val onBackActionsInverted: (Boolean) -> Unit,
@@ -329,14 +327,6 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha
if (!qamStartedOnPress) a.onQam.invoke()
qamStartedOnPress = false
}
// Big Picture's own "Switch to Desktop" waits on SteamOS Manager for ever
// here; this does the switch without the client.
if (a.onSwitchToDesktop != null) {
QuickAction(stringResource(R.string.drawer_desktop), Icons.Outlined.DesktopWindows, Modifier.weight(1f).then(focus.track(page, "desktop")), compact = short) {
host.open = null
a.onSwitchToDesktop.invoke()
}
}
}
}