From 61f31f502d2bf00d2abe98a4f5a1c3f36d77e377 Mon Sep 17 00:00:00 2001 From: magartus Date: Thu, 1 Oct 2026 21:21:52 +0200 Subject: [PATCH] Add the upscaler to the session drawer, applied live The drawer's Display page gets the same Upscaler and Upscaler sharpness choices as the session settings. A pick is saved and handed straight to the compositor, so it takes effect on the next frame without restarting the session. --- .../java/com/droiddeck/launcher/SessionActivity.kt | 13 +++++++++++++ .../com/droiddeck/launcher/ui/SessionOverlay.kt | 10 ++++++++++ 2 files changed, 23 insertions(+) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 004a4f71a5..f41848a2c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -190,6 +190,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private var pcKeyboardOpen by mutableStateOf(false) private var hudOn by mutableStateOf(true) private var fillScreen by mutableStateOf(true) + private var upscaler by mutableStateOf(0) + private var upscaleSharpness by mutableStateOf(75) private var lossless by mutableStateOf(Lossless.State.NONE) private val pickLossless = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { r -> if (r.resultCode == RESULT_OK) InAppFilePicker.pickedFile(r.data)?.let { importLossless(it) } @@ -417,6 +419,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { androidApps = androidApps, hudOn = hudOn, fillScreen = if (SessionState.mode == SessionService.MODE_STEAM) fillScreen else null, + upscaler = upscaler, upscaleSharpness = upscaleSharpness, frameGen = frameGen, lossless = lossless, oscMode = oscMode, suspendPolicy = suspendPolicy, touchMode = touchMode, @@ -427,6 +430,14 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { selectedSecondScreenDisplay = selectedSecondScreenDisplay, onHud = { on -> SessionPrefs.setHudEnabled(this@SessionActivity, on); hudOn = on; hud.refresh() }, onFillScreen = { on -> SessionPrefs.setForceFullscreen(this@SessionActivity, on); fillScreen = on }, + onUpscaler = { m -> + SessionPrefs.setUpscaler(this@SessionActivity, m); upscaler = m + WaylandCompositor.nativeSetUpscaler(m) + }, + onUpscaleSharpness = { pct -> + SessionPrefs.setUpscaleSharpness(this@SessionActivity, pct); upscaleSharpness = pct + WaylandCompositor.nativeSetUpscaleSharpness(pct) + }, onFrameGenPick = { mode -> FrameGen.set(this@SessionActivity, mode) readPrefs() @@ -642,6 +653,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { private fun readPrefs() { hudOn = SessionPrefs.hudEnabled(this) fillScreen = SessionPrefs.forceFullscreen(this) + upscaler = SessionPrefs.upscaler(this) + upscaleSharpness = SessionPrefs.upscaleSharpness(this) touchMode = SessionPrefs.touchMode(this) frameGen = FrameGen.mode(this) fexPreset = SessionPrefs.fexPreset(this) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index af38940f04..5c9a363ce9 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -170,6 +170,8 @@ class DrawerActions( val fexPreset: String, /** Steam only: games stretched to the screen's size, changed live (null = not Steam). */ val fillScreen: Boolean? = null, + val upscaler: Int = 0, + val upscaleSharpness: Int = 75, val secondScreenMode: SecondScreenMode, val secondScreenDisplays: List, val selectedSecondScreenDisplay: Int, @@ -191,6 +193,8 @@ class DrawerActions( val onShape: (String) -> Unit, val onFexPreset: (String) -> Unit, val onFillScreen: (Boolean) -> Unit = {}, + val onUpscaler: (Int) -> Unit = {}, + val onUpscaleSharpness: (Int) -> Unit = {}, val onSecondScreenMode: (SecondScreenMode) -> Unit, val onSecondScreenDisplay: (Int) -> Unit, val onLaunchAndroidApp: (HomeApp.LaunchableApp, Int?) -> Unit, @@ -346,6 +350,12 @@ fun SessionDrawer(open: Boolean, page: Int, controllerActive: Boolean, onPageCha host, "fill", "Stretch games to fill", null, a.fillScreen, chipModifier = focus.track(page, "fill"), onChange = a.onFillScreen, ) + ChoiceRow(host, "upscaler", "Upscaler", null, + SessionPrefs.upscalerChoices, a.upscaler, + chipModifier = focus.track(page, "upscaler"), onPick = a.onUpscaler) + ChoiceRow(host, "upscale-sharpness", "Upscaler sharpness", null, + SessionPrefs.upscaleSharpnessChoices, a.upscaleSharpness, enabled = a.upscaler != 0, + chipModifier = focus.track(page, "upscale-sharpness"), onPick = a.onUpscaleSharpness) val fgOpen = host.open == "fg" val fgLabel = FrameGen.label(LocalContext.current, a.frameGen) SettingsRow(stringResource(R.string.frame_gen_title), null, highlighted = fgOpen) {