Merge pull request #88 from theupriser/feature/gnome-relogin

App: Restart GNOME after the theme, desktop scale, row and switch clicks

CHANGELOG.md

@@ -12,6 +12,10 @@ one per merged pull request.
 - `645b331` **feat: the GNOME theme installs GNOME Settings with the "GNOME Desktop" panel (dock, desktop icons, tiling) as a prebuilt package, downloaded from the `settings` release of steamify-gnome-theme (built by GitHub Actions on current Arch, rebuilt weekly) and checked against its `.sha256`; a failure keeps the stock Settings. Turning the theme off puts the stock `gnome-control-center` back. Installs with the GNOME theme on re-apply it (feature version 2.13.0)**
 - **fix: the app's logo (an SVG) shows on a fresh install: `pyside6` doesn't depend on `qt6-svg`, Qt's SVG plugin, so without it the header logo was empty and the window had no icon of its own; it is installed with PySide6 (the app's installer, the launcher, the update notifier)**
 
+- **feat: after the GNOME theme is applied in a GNOME session, the app's done screen has "Restart GNOME" (GNOME Shell on Wayland can't restart in place, and the dock, extensions and Settings panel only show after a new login): with GDM autologin (the SteamOS conversion) Steamify's relogin helper logs the user straight back into the session they were in (without changing the session gaming mode's boot goes back to), else it is a plain logout (`gnome-session-quit`)**
+- **fix: the app on a desktop (a window, however large, also fullscreen) keeps the desktop's own scale instead of blowing its 1280x720 layout up to the screen's height (twice as big on a 1440p or ultrawide monitor): the layout fills the window at the scale of GNOME or KDE, and only a window smaller than 1280x720 shrinks it. The TV mode (`--fullscreen`, gamescope) still scales to the screen**
+- **fix: in the app a click on a row only selects it (a second click on the selected row used to flip it, so a click on a switch needed two); a click on the switch itself, or on the BIOS update button, acts at once and selects the row too**
+
 ## 2.12.0 - 2026-10-13
 
 - **feat: setting up the SteamOS conversion on NVIDIA first checks that nothing blocks it (a pacman lock, less than 1.5 GB free), and a failed setup is remembered: a desktop notification now and a reminder in the menu until a setup works**

lib/backend.sh

@@ -195,7 +195,10 @@ backend_apply() {
     feature_record_unticked
     os_version_refresh
     [[ " ${TO_DISABLE[*]} ${TO_ENABLE[*]} " =~ \ (gaming|single|boot|kpin)\  ]] && RESTART_FOR_LOGIN=true
-    backend_event finished "\"failed\":$(json_list "${failed[@]}"),\"restart\":$(restart_needed && echo true || echo false)"
+    # (Only when the theme itself worked: a failed one has nothing to log in again for.)
+    local relogin=false
+    [[ " ${failed[*]:-} " != *" gnometheme "* ]] && gnometheme_relogin_needed "${TO_DISABLE[@]}" "${TO_ENABLE[@]}" && relogin=true
+    backend_event finished "\"failed\":$(json_list "${failed[@]}"),\"restart\":$(restart_needed && echo true || echo false),\"relogin\":$relogin"
 }
 
 backend_main() {

lib/gnome-theme.sh

@@ -111,6 +111,22 @@ gnometheme_shell() {
     done
 }
 
+gnometheme_relogin_needed() {
+    # A GNOME session is running and this run changed the theme: GNOME Shell on Wayland can't be restarted in place, so
+    # the new extensions, the dock and the Settings panel show after the user logs in again.
+    [[ " $* " == *" gnometheme "* ]] && pgrep -u "$(id -u)" -x gnome-shell >/dev/null 2>&1
+}
+
+gnometheme_relogin() {
+    # End the GNOME session. With GDM autologin set up by the conversion, steamify-gdm-relogin logs the user straight back
+    # into the session they were in (GDM takes it from AccountsService; the session is not changed here, unlike
+    # steamos-session-select, which would make GNOME the one gaming mode's boot goes back to). Without that helper there
+    # is no autologin: a plain logout, and the user logs in again.
+    local helper=/usr/local/libexec/steamify-gdm-relogin
+    if [[ -x "$helper" ]] && sudo -n "$helper"; then return 0; fi
+    gnome-session-quit --logout --no-prompt
+}
+
 gnometheme_settings_install() {
     # The prebuilt GNOME Settings with the Desktop panel, replacing the stock one. Never fatal: the theme works without the
     # panel, so a failed download or install keeps the stock Settings and says so.
@@ -172,6 +188,8 @@ gnometheme_enable() {
     gnometheme_shell
     gnometheme_settings_install
     ok "SteamOS theme for GNOME on (apps pick up the colors when they start again)."
+    # (GNOME Shell on Wayland can't restart in place: the app offers "Restart GNOME", which is this.)
+    gnometheme_relogin_needed gnometheme && info "Log out and back in for the dock, the extensions and the Settings panel to show."
 }
 
 gnometheme_disable() {

ui/qml/AppState.qml

@@ -18,6 +18,7 @@ Item {
     property var steps: ({})                 // id -> "wait"|"run"|"ok"|"fail"
     property var failed: []
     property bool restartNeeded: false
+    property bool reloginNeeded: false      // GNOME loads the new theme's extensions at the next login
     // Review & apply only when something would change; "Re-apply what's on"
     // is for when nothing did.
     readonly property bool canApply: computePlan().length > 0
@@ -123,7 +124,7 @@ Item {
     }
 
     // --- Password and apply ---
-    function resetRun() { steps = {}; failed = []; restartNeeded = false; runError = ""; doneCount = 0; logModel.clear(); }
+    function resetRun() { steps = {}; failed = []; restartNeeded = false; reloginNeeded = false; runError = ""; doneCount = 0; logModel.clear(); }
     function startApply(password) {
         resetRun();
         var s = {};
@@ -203,7 +204,7 @@ Item {
                 // A successful BIOS check ends with bios-ready instead, keeping
                 // the password for the flash.
                 app.sessionPassword = "";
-                app.failed = ev.failed || []; app.restartNeeded = !!ev.restart;
+                app.failed = ev.failed || []; app.restartNeeded = !!ev.restart; app.reloginNeeded = !!ev.relogin;
                 app.runError = app.errorText(ev.error);
                 app.screen = "done";
             }
@@ -249,6 +250,7 @@ Item {
             else if (a === "release") { holding = false; if (holdProgress < 1) holdProgress = 0; }
         } else if (screen === "done") {
             if (a === "accept" && restartNeeded) backend.restart();
+            else if (a === "accept" && reloginNeeded) backend.restartGnome();
             else if (a === "back" || a === "accept") backToMenu();
         }
     }

ui/qml/DoneScreen.qml

@@ -9,7 +9,8 @@ Item {
     readonly property bool problem: app.failed.length > 0 || app.runError !== ""
     readonly property string message: {
         if (app.runError) return app.runError;
-        if (!app.biosRun) return app.plan.length + (app.plan.length === 1 ? " change" : " changes") + " applied." + (app.restartNeeded ? " Some take effect after a restart." : "");
+        if (!app.biosRun) return app.plan.length + (app.plan.length === 1 ? " change" : " changes") + " applied." + (app.restartNeeded ? " Some take effect after a restart." : "")
+             + (app.reloginNeeded && !app.restartNeeded ? " GNOME shows the dock, extensions and Settings panel after you log in again: Restart GNOME does that." : "");
         if (app.failed.length) return "The BIOS was not changed.";
         return (app.bios && app.bios.dryRun ? "Dry run: nothing was flashed. " : "BIOS " + (app.biosInfo.newest || "") + " is staged and is written during the restart. ")
              + "Keep the power on and don't touch the machine until it has fully started again, even if the screen stays black.";
@@ -33,6 +34,7 @@ Item {
                 delegate: Text { required property string line; width: details.width - 12; text: line; color: "#aab5c4"; font.family: Theme.mono; font.pixelSize: 13; wrapMode: Text.WrapAnywhere } } }
         Row { anchors.horizontalCenter: parent.horizontalCenter; spacing: 14; topPadding: 8
             Btn { k: Input.g.back; text: "Back to the menu"; height: 52; onClicked: app.act("back") }
-            Btn { visible: app.restartNeeded; k: Input.g.ok; text: "Restart now"; primary: true; height: 52; onClicked: app.backend.restart() } }
+            Btn { visible: app.restartNeeded; k: Input.g.ok; text: "Restart now"; primary: true; height: 52; onClicked: app.backend.restart() }
+            Btn { visible: app.reloginNeeded && !app.restartNeeded; k: Input.g.ok; text: "Restart GNOME"; primary: true; height: 52; onClicked: app.backend.restartGnome() } }
     }
 }

ui/qml/Main.qml

@@ -36,7 +36,11 @@ ApplicationWindow {
     // own shape, so the bars reach the edges and the content fills it.
     Item {
         id: stage
-        readonly property real k: Math.min(win.width / 1280, win.height / 720)
+        // On a desktop (a window, however large) the UI keeps the desktop's own scale: 1 here is one logical pixel, which Qt
+        // multiplies by the scale of GNOME or KDE, like any other app (a 1440p or ultrawide monitor would otherwise show
+        // everything twice as big). Only a window smaller than the layout shrinks it. The TV mode (--fullscreen, gamescope)
+        // scales to the screen: it is read from the couch.
+        readonly property real k: Math.min(win.width / 1280, win.height / 720, win.fullscreen ? Infinity : 1)
         width: win.width / k; height: win.height / k
         transformOrigin: Item.TopLeft
         scale: k

ui/qml/MenuRow.qml

@@ -31,7 +31,9 @@ Item {
         color: row.selected ? Theme.cardSel : Theme.card
         border.width: row.selected ? 2 : 0; border.color: Theme.accent
         MouseArea { anchors.fill: parent; cursorShape: Qt.PointingHandCursor
-            onClicked: { Input.type = "keyboard"; if (row.selected) app.act("accept"); else app.sel = row.rowIndex; } }
+            // A click on the row only selects it; the switch, the Gaming/Desktop buttons and the BIOS button act on their own
+            // click (below), selecting the row too.
+            onClicked: { Input.type = "keyboard"; app.sel = row.rowIndex; } }
 
         Text { visible: !!row.it.parent; x: 20; anchors.verticalCenter: parent.verticalCenter; text: "└"; color: "#56627a"; font.pixelSize: 18 }
         Column {
@@ -67,14 +69,18 @@ Item {
             Rectangle { id: sw; visible: row.it.kind === "toggle"; anchors.right: parent.right; anchors.verticalCenter: parent.verticalCenter
                 width: 46; height: 26; radius: 13; color: row.on ? Theme.accent : "#343f50"
                 Behavior on color { ColorAnimation { duration: 120 } }
-                Rectangle { width: 20; height: 20; radius: 10; color: "#f4f7fb"; y: 3; x: row.on ? 23 : 3; Behavior on x { NumberAnimation { duration: 120 } } } }
+                Rectangle { width: 20; height: 20; radius: 10; color: "#f4f7fb"; y: 3; x: row.on ? 23 : 3; Behavior on x { NumberAnimation { duration: 120 } } }
+                MouseArea { anchors.fill: parent; anchors.margins: -6; cursorShape: Qt.PointingHandCursor
+                    onClicked: { Input.type = "keyboard"; app.sel = row.rowIndex; app.act("accept"); } } }
             Text { visible: row.it.kind === "toggle"; anchors.right: sw.left; anchors.rightMargin: 12; anchors.verticalCenter: parent.verticalCenter
                    text: row.it.on ? "now on" : "now off"; color: row.it.on ? Theme.good : Theme.faint; font.family: Theme.mono; font.pixelSize: 12 }
             // action (Update BIOS)
             Rectangle { visible: row.it.kind === "action"; anchors.right: parent.right; anchors.verticalCenter: parent.verticalCenter
                 width: at.implicitWidth + 24; height: 30; radius: 8; color: Theme.warnBg
                 Text { id: at; anchors.centerIn: parent; color: Theme.warn; font.family: Theme.body; font.pixelSize: 13; font.weight: Font.DemiBold
-                       text: app.biosChecking ? "Checking…" : app.bios && app.bios.selectable ? "Update…" : (app.bios && app.bios.newest ? "Up to date" : "Unavailable") } }
+                       text: app.biosChecking ? "Checking…" : app.bios && app.bios.selectable ? "Update…" : (app.bios && app.bios.newest ? "Up to date" : "Unavailable") }
+                MouseArea { anchors.fill: parent; cursorShape: Qt.PointingHandCursor
+                    onClicked: { Input.type = "keyboard"; app.sel = row.rowIndex; app.act("accept"); } } }
         }
     }
 }

ui/steamify-ui

@@ -345,6 +345,16 @@ class Backend(QObject):
     def restart(self):
         QProcess.startDetached("systemctl", ["reboot"])
 
+    @Slot()
+    def restartGnome(self):
+        # GNOME Shell on Wayland can't restart in place: end the session. With GDM autologin (the SteamOS conversion)
+        # Steamify's helper logs the user straight back in; else a plain logout.
+        import subprocess
+        helper = "/usr/local/libexec/steamify-gdm-relogin"
+        if os.access(helper, os.X_OK) and subprocess.run(["sudo", "-n", helper], capture_output=True).returncode == 0:
+            return
+        QProcess.startDetached("gnome-session-quit", ["--logout", "--no-prompt"])
+
     def shutdown(self):
         if self._proc and self._proc.state() != QProcess.NotRunning:
             self._proc.kill()