session: move to drawers

3 files changed, 28 insertions, 5 deletions

diff --git a/modules/drawers/Backgrounds.qml b/modules/drawers/Backgrounds.qml
index 94d8dee..017b883 100644
--- a/modules/drawers/Backgrounds.qml
+++ b/modules/drawers/Backgrounds.qml
@@ -2,6 +2,7 @@ import "root:/services"
 import "root:/config"
 import "root:/modules/osd" as Osd
 import "root:/modules/notifications" as Notifications
+import "root:/modules/session" as Session
 import Quickshell
 import QtQuick
 import QtQuick.Shapes
@@ -19,8 +20,8 @@ Shape {
     Osd.Background {
         wrapper: panels.osd
 
-        startX: root.width
-        startY: (root.height - panels.osd.height) / 2
+        startX: root.width - panels.session.width
+        startY: (root.height - wrapper.height) / 2
     }
 
     Notifications.Background {
@@ -29,4 +30,11 @@ Shape {
         startX: root.width
         startY: 0
     }
+
+    Session.Background {
+        wrapper: panels.session
+
+        startX: root.width
+        startY: (root.height - wrapper.height) / 2
+    }
 }
diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml
index fe70b8c..5aa5b50 100644
--- a/modules/drawers/Drawers.qml
+++ b/modules/drawers/Drawers.qml
@@ -4,6 +4,7 @@ import "root:/widgets"
 import "root:/services"
 import "root:/config"
 import Quickshell
+import Quickshell.Wayland
 import QtQuick
 
 Variants {
@@ -24,6 +25,7 @@ Variants {
             screen: scope.modelData
             name: "drawers"
             exclusionMode: ExclusionMode.Ignore
+            keyboardFocus: visibilities.launcher || visibilities.session ? WlrKeyboardFocus.Exclusive : WlrKeyboardFocus.None
 
             mask: Region {
                 x: BorderConfig.thickness
@@ -77,6 +79,8 @@ Variants {
                 property bool osd
                 property bool notifications: Notifs.popups.length > 0
                 property bool session
+
+                Component.onCompleted: Visibilities.screens[scope.modelData] = this
             }
 
             Interactions {
diff --git a/modules/drawers/Panels.qml b/modules/drawers/Panels.qml
index 645af21..fb1a9f5 100644
--- a/modules/drawers/Panels.qml
+++ b/modules/drawers/Panels.qml
@@ -1,6 +1,7 @@
 import "root:/config"
 import "root:/modules/osd" as Osd
 import "root:/modules/notifications" as Notifications
+import "root:/modules/session" as Session
 import Quickshell
 import QtQuick
 
@@ -12,6 +13,7 @@ Item {
 
     readonly property Osd.Wrapper osd: osd
     readonly property Notifications.Wrapper notifications: notifications
+    readonly property Session.Wrapper session: session
 
     anchors.fill: parent
     anchors.margins: BorderConfig.thickness
@@ -20,19 +22,28 @@ Item {
         id: osd
 
         screen: root.screen
-        visibility: visibilities.osd
+        visibility: root.visibilities.osd
 
         anchors.verticalCenter: parent.verticalCenter
         anchors.right: parent.right
+        anchors.rightMargin: session.width
     }
 
     Notifications.Wrapper {
         id: notifications
 
-        screen: root.screen
-        visibility: visibilities.notifications
+        visibility: root.visibilities.notifications
 
         anchors.top: parent.top
         anchors.right: parent.right
     }
+
+    Session.Wrapper {
+        id: session
+
+        visibilities: root.visibilities
+
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.right: parent.right
+    }
 }