Merge branch 'main' into feat/device-pixel-alignment

Modules/Sidebar/Notif.qml

@@ -4,6 +4,8 @@ import QtQuick
 import QtQuick.Layouts
 import Quickshell
 import ZShell.Config
+import ZShell.Components
+import ZShell.Services
 import qs.Components
 import qs.Services
 import qs.Daemons
@@ -14,7 +16,7 @@ CustomRect {
 
 	readonly property CustomText body: (expandedContent.item as ExpandedBody)?.body ?? null
 	required property bool expanded
-	required property NotifServer.Notif modelData
+	required property NotificationRow modelData
 	readonly property real nonAnimHeight: expanded ? summary.implicitHeight + expandedContent.implicitHeight + expandedContent.anchors.topMargin + Tokens.padding.medium * 2 : summaryHeightMetrics.height
 	required property ScreenState screenState
 

Modules/Sidebar/NotifActionList.qml

@@ -9,12 +9,11 @@ import ZShell.Components
 import qs.Components
 import qs.Effects
 import qs.Services
-import qs.Daemons
 
 Item {
 	id: root
 
-	required property NotifServer.Notif notif
+	required property NotificationRow notif
 
 	Layout.fillWidth: true
 	implicitHeight: actionList.implicitHeight
@@ -30,7 +29,7 @@ Item {
 				{
 					isClose: true
 				},
-				...(root.notif?.actions ?? []),
+				...Array.from(root.notif?.actions ?? []),
 				{
 					isCopy: true
 				}

Modules/Sidebar/NotifDock.qml

@@ -81,9 +81,8 @@ Item {
 			Behavior on opacity {
 				Anim {}
 			}
-			sourceComponent: SnapLayout {
+			sourceComponent: ColumnLayout {
 				spacing: 20
-				orientation: Qt.Vertical
 
 				CustomText {
 					Layout.alignment: Qt.AlignHCenter

Modules/Sidebar/NotifGroupList.qml

@@ -3,8 +3,8 @@ pragma ComponentBehavior: Bound
 import QtQuick
 import Quickshell
 import ZShell.Components
+import ZShell.Services
 import ZShell.Config
-import qs.Daemons
 import qs.Components
 import qs.Services
 
@@ -35,7 +35,7 @@ LazyListView {
 			id: notif
 
 			required property int index
-			required property NotifServer.Notif modelData
+			required property NotificationRow modelData
 			property int startY
 
 			LazyListView.preferredHeight: modelData?.closed || LazyListView.removing ? 0 : notifInner.nonAnimHeight