2 files changed, 79 insertions, 1 deletions
diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
index 13eb7ba..39b9624 100644
--- a/modules/bar/Bar.qml
+++ b/modules/bar/Bar.qml
@@ -1,7 +1,7 @@
 import "root:/widgets"
 import "root:/services"
 import "root:/config"
-import "root:/modules/bar/popouts" as BarPopouts
+import "popouts" as BarPopouts
 import "components"
 import "components/workspaces"
 import Quickshell
diff --git a/modules/bar/BarWrapper.qml b/modules/bar/BarWrapper.qml
new file mode 100644
index 0000000..698761d
--- /dev/null
+++ b/modules/bar/BarWrapper.qml
@@ -0,0 +1,78 @@
+pragma ComponentBehavior: Bound
+
+import "root:/services"
+import "root:/config"
+import "popouts" as BarPopouts
+import Quickshell
+import QtQuick
+
+Item {
+    id: root
+
+    required property ShellScreen screen
+    required property PersistentProperties visibilities
+    required property BarPopouts.Wrapper popouts
+
+    readonly property int exclusiveZone: Config.bar.persistent || (visibilities.bar && !isHovered) ? content.implicitWidth : Config.border.thickness
+    property bool isHovered
+
+    function checkPopout(y: real): void {
+        content.item?.checkPopout(y);
+    }
+
+    visible: width > Config.border.thickness
+    implicitWidth: Config.border.thickness
+    implicitHeight: content.implicitHeight
+
+    states: State {
+        name: "visible"
+        when: Config.bar.persistent || root.visibilities.bar
+
+        PropertyChanges {
+            root.implicitWidth: content.implicitWidth
+        }
+    }
+
+    transitions: [
+        Transition {
+            from: ""
+            to: "visible"
+
+            NumberAnimation {
+                target: root
+                property: "implicitWidth"
+                duration: Appearance.anim.durations.expressiveDefaultSpatial
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: Appearance.anim.curves.expressiveDefaultSpatial
+            }
+        },
+        Transition {
+            from: "visible"
+            to: ""
+
+            NumberAnimation {
+                target: root
+                property: "implicitWidth"
+                duration: Appearance.anim.durations.normal
+                easing.type: Easing.BezierSpline
+                easing.bezierCurve: Appearance.anim.curves.emphasized
+            }
+        }
+    ]
+
+    Loader {
+        id: content
+
+        Component.onCompleted: active = Qt.binding(() => root.visibilities.bar || root.visible)
+
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+
+        sourceComponent: Bar {
+            screen: root.screen
+            visibilities: root.visibilities
+            popouts: root.popouts
+        }
+    }
+}