change things

4 files changed, 6 insertions, 65 deletions

diff --git a/modules/drawers/Backgrounds.qml b/modules/drawers/Backgrounds.qml
index 7fa2ca1..1eed114 100644
--- a/modules/drawers/Backgrounds.qml
+++ b/modules/drawers/Backgrounds.qml
@@ -6,7 +6,6 @@ import qs.modules.session as Session
 import qs.modules.launcher as Launcher
 import qs.modules.dashboard as Dashboard
 import qs.modules.bar.popouts as BarPopouts
-import qs.modules.utilities as Utilities
 import qs.modules.sidebar as Sidebar
 import QtQuick
 import QtQuick.Shapes
@@ -66,14 +65,6 @@ Shape {
         startY: wrapper.y - rounding * sideRounding
     }
 
-    Utilities.Background {
-        wrapper: root.panels.utilities
-        sidebar: sidebar
-
-        startX: root.width
-        startY: root.height
-    }
-
     Sidebar.Background {
         id: sidebar
 
diff --git a/modules/drawers/Drawers.qml b/modules/drawers/Drawers.qml
index 86c9e99..4ae0b92 100644
--- a/modules/drawers/Drawers.qml
+++ b/modules/drawers/Drawers.qml
@@ -31,7 +31,7 @@ Variants {
 
             readonly property bool hasFullscreen: Hypr.monitorFor(screen)?.activeWorkspace?.toplevels.values.some(t => t.lastIpcObject.fullscreen === 2) ?? false
             readonly property int dragMaskPadding: {
-                if (focusGrab.active || panels.popouts.isDetached)
+                if (focusGrab.active)
                     return 0;
 
                 const mon = Hypr.monitorFor(screen);
@@ -140,7 +140,6 @@ Variants {
                 property bool session
                 property bool launcher
                 property bool dashboard
-                property bool utilities
                 property bool sidebar
 
                 Component.onCompleted: Visibilities.load(scope.modelData, this)
diff --git a/modules/drawers/Interactions.qml b/modules/drawers/Interactions.qml
index 9579b15..8c026ce 100644
--- a/modules/drawers/Interactions.qml
+++ b/modules/drawers/Interactions.qml
@@ -16,7 +16,6 @@ CustomMouseArea {
     property point dragStart
     property bool dashboardShortcutActive
     property bool osdShortcutActive
-    property bool utilitiesShortcutActive
 
     function withinPanelHeight(panel: Item, x: real, y: real): bool {
         const panelY = Config.border.thickness + panel.y;
@@ -65,9 +64,6 @@ CustomMouseArea {
             if (!dashboardShortcutActive)
                 visibilities.dashboard = false;
 
-            if (!utilitiesShortcutActive)
-                visibilities.utilities = false;
-
             if (!popouts.currentName.startsWith("traymenu") || (popouts.current?.depth ?? 0) <= 1) {
                 popouts.hasCurrent = false;
                 bar.closeTray();
@@ -79,9 +75,6 @@ CustomMouseArea {
     }
 
     onPositionChanged: event => {
-        if (popouts.isDetached)
-            return;
-
         const x = event.x;
         const y = event.y;
         const dragX = x - dragStart.x;
@@ -187,17 +180,6 @@ CustomMouseArea {
                 visibilities.dashboard = false;
         }
 
-        // Show utilities on hover
-        const showUtilities = inBottomPanel(panels.utilities, x, y);
-
-        // Always update visibility based on hover if not in shortcut mode
-        if (!utilitiesShortcutActive) {
-            visibilities.utilities = showUtilities;
-        } else if (showUtilities) {
-            // If hovering over utilities area while in shortcut mode, transition to hover control
-            utilitiesShortcutActive = false;
-        }
-
         // Show popouts on hover
         if (x < bar.implicitWidth) {
             bar.checkPopout(y);
@@ -216,7 +198,6 @@ CustomMouseArea {
             if (!root.visibilities.launcher) {
                 root.dashboardShortcutActive = false;
                 root.osdShortcutActive = false;
-                root.utilitiesShortcutActive = false;
 
                 // Also hide dashboard and OSD if they're not being hovered
                 const inDashboardArea = root.inTopPanel(root.panels.dashboard, root.mouseX, root.mouseY);
@@ -257,18 +238,5 @@ CustomMouseArea {
                 root.osdShortcutActive = false;
             }
         }
-
-        function onUtilitiesChanged() {
-            if (root.visibilities.utilities) {
-                // Utilities became visible, immediately check if this should be shortcut mode
-                const inUtilitiesArea = root.inBottomPanel(root.panels.utilities, root.mouseX, root.mouseY);
-                if (!inUtilitiesArea) {
-                    root.utilitiesShortcutActive = true;
-                }
-            } else {
-                // Utilities hidden, clear shortcut flag
-                root.utilitiesShortcutActive = false;
-            }
-        }
     }
 }
diff --git a/modules/drawers/Panels.qml b/modules/drawers/Panels.qml
index 7705732..d459a04 100644
--- a/modules/drawers/Panels.qml
+++ b/modules/drawers/Panels.qml
@@ -5,8 +5,7 @@ import qs.modules.session as Session
 import qs.modules.launcher as Launcher
 import qs.modules.dashboard as Dashboard
 import qs.modules.bar.popouts as BarPopouts
-import qs.modules.utilities as Utilities
-import qs.modules.utilities.toasts as Toasts
+import qs.modules.toasts as Toasts
 import qs.modules.sidebar as Sidebar
 import Quickshell
 import QtQuick
@@ -24,7 +23,6 @@ Item {
     readonly property alias launcher: launcher
     readonly property alias dashboard: dashboard
     readonly property alias popouts: popouts
-    readonly property alias utilities: utilities
     readonly property alias toasts: toasts
     readonly property alias sidebar: sidebar
 
@@ -35,13 +33,13 @@ Item {
     Osd.Wrapper {
         id: osd
 
-        clip: session.width > 0 || sidebar.width > 0
+        clip: sidebar.width > 0
         screen: root.screen
         visibilities: root.visibilities
 
         anchors.verticalCenter: parent.verticalCenter
         anchors.right: parent.right
-        anchors.rightMargin: session.width + sidebar.width
+        anchors.rightMargin: sidebar.width
     }
 
     Notifications.Wrapper {
@@ -66,6 +64,7 @@ Item {
         anchors.rightMargin: sidebar.width
     }
 
+
     Launcher.Wrapper {
         id: launcher
 
@@ -91,11 +90,7 @@ Item {
 
         screen: root.screen
 
-        x: isDetached ? (root.width - nonAnimWidth) / 2 : 0
         y: {
-            if (isDetached)
-                return (root.height - nonAnimHeight) / 2;
-
             const off = currentCenter - Config.border.thickness - nonAnimHeight / 2;
             const diff = root.height - Math.floor(off + nonAnimHeight);
             if (diff < 0)
@@ -104,21 +99,10 @@ Item {
         }
     }
 
-    Utilities.Wrapper {
-        id: utilities
-
-        visibilities: root.visibilities
-        sidebar: sidebar
-        popouts: popouts
-
-        anchors.bottom: parent.bottom
-        anchors.right: parent.right
-    }
-
     Toasts.Toasts {
         id: toasts
 
-        anchors.bottom: sidebar.visible ? parent.bottom : utilities.top
+        anchors.bottom: parent.bottom
         anchors.right: sidebar.left
         anchors.margins: Appearance.padding.normal
     }
@@ -130,7 +114,6 @@ Item {
         panels: root
 
         anchors.top: notifications.bottom
-        anchors.bottom: utilities.top
         anchors.right: parent.right
     }
 }