last 7 months of qs changes

modules/user/modules/quickshell/shell/bar/Bar.qml

@@ -1,3 +1,4 @@
+pragma ComponentBehavior: Bound
 import QtQuick
 import QtQuick.Layouts
 import QtQuick.Controls
@@ -5,7 +6,8 @@ import Quickshell
 import "systray" as SysTray
 import "audio" as Audio
 import "mpris" as Mpris
-import "workspaces" as Workspaces
+import "power" as Power
+import "root:notifications" as Notifs
 
 BarContainment {
 	id: root
@@ -13,6 +15,7 @@ BarContainment {
 	property bool isSoleBar: Quickshell.screens.length == 1;
 
 	ColumnLayout {
+
 		anchors {
 			left: parent.left
 			right: parent.right
@@ -21,24 +24,32 @@ BarContainment {
 
 		ColumnLayout {
 			Layout.fillWidth: true
-			spacing: 0
 
-			Loader {
-				active: isSoleBar
-				Layout.preferredHeight: active ? implicitHeight : 0;
+			Notifs.NotificationWidget {
 				Layout.fillWidth: true
-
-				sourceComponent: Workspaces.Widget {
-					bar: root
-					wsBaseIndex: 1
-				}
+				bar: root
 			}
 
-			Workspaces.Widget {
-				bar: root
-				Layout.fillWidth: true
-				wsBaseIndex: root.screen.name == "eDP-1" ? 11 : 1;
-				hideWhenEmpty: isSoleBar
+			ColumnLayout {
+				spacing: 0
+
+				Loader {
+					active: root.isSoleBar
+					Layout.preferredHeight: active ? implicitHeight : 0;
+					Layout.fillWidth: true
+
+					sourceComponent: Workspaces {
+						bar: root
+						wsBaseIndex: 1
+					}
+				}
+
+				Workspaces {
+					bar: root
+					Layout.fillWidth: true
+					wsBaseIndex: root.screen.name == "eDP-1" ? 11 : 1;
+					hideWhenEmpty: root.isSoleBar
+				}
 			}
 		}
 	}
@@ -65,8 +76,15 @@ BarContainment {
 			Layout.fillWidth: true
 		}
 
-		ClockWidget {
+		Power.Power {
+			bar: root
 			Layout.fillWidth: true
 		}
+
+		ClockWidget {
+			bar: root
+			Layout.fillWidth: true
+		}
+
 	}
 }