From 510cb45ac1a42ae6433ebb57082547c3c2c19305 Mon Sep 17 00:00:00 2001
From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com>
Date: Wed, 17 Sep 2025 19:46:51 +1000
Subject: session: loader content

---
 modules/session/Content.qml | 15 ++++-----------
 modules/session/Wrapper.qml | 13 +++++++++++--
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'modules/session')

diff --git a/modules/session/Content.qml b/modules/session/Content.qml
index 41ecb3b..6c56d44 100644
--- a/modules/session/Content.qml
+++ b/modules/session/Content.qml
@@ -13,10 +13,6 @@ Column {
     required property PersistentProperties visibilities
 
     padding: Appearance.padding.large
-
-    anchors.verticalCenter: parent.verticalCenter
-    anchors.left: parent.left
-
     spacing: Appearance.spacing.large
 
     SessionButton {
@@ -27,17 +23,14 @@ Column {
 
         KeyNavigation.down: shutdown
 
+        Component.onCompleted: forceActiveFocus()
+
         Connections {
             target: root.visibilities
 
-            function onSessionChanged(): void {
-                if (root.visibilities.session)
-                    logout.focus = true;
-            }
-
             function onLauncherChanged(): void {
-                if (root.visibilities.session && !root.visibilities.launcher)
-                    logout.focus = true;
+                if (!root.visibilities.launcher)
+                    logout.forceActiveFocus();
             }
         }
     }
diff --git a/modules/session/Wrapper.qml b/modules/session/Wrapper.qml
index facb0ff..967d8c3 100644
--- a/modules/session/Wrapper.qml
+++ b/modules/session/Wrapper.qml
@@ -1,3 +1,5 @@
+pragma ComponentBehavior: Bound
+
 import qs.components
 import qs.config
 import Quickshell
@@ -44,9 +46,16 @@ Item {
         }
     ]
 
-    Content {
+    Loader {
         id: content
 
-        visibilities: root.visibilities
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+
+        Component.onCompleted: active = Qt.binding(() => (root.visibilities.session && Config.session.enabled) || root.visible)
+
+        sourceComponent: Content {
+            visibilities: root.visibilities
+        }
     }
 }
-- 
cgit v1.2.3-freya