feat: add wip notifications to dash

src/Dashboard.qml

@@ -1,9 +1,11 @@
 import Quickshell
+import Quickshell.Services.Notifications
 import QtQuick
 import QtQuick.Layouts
 import QtQml
 import "base"
 import "widgets/mpris"
+import "widgets/notifications"
 import "provider"
 
 PanelWindow {
@@ -47,23 +49,6 @@ PanelWindow {
 
             Component.onCompleted: () => maxSize = homeWindow.screen.width * (2 / 7)
 
-            ListView {
-                width: parent.width
-                height: parent.height
-                model: Notifications.incoming
-
-                delegate: Rectangle {
-                    required property var modelData
-                    width: 100
-                    height: 50
-                    Text {
-                        text: parent.modelData.appName
-                        width: parent.width
-                        height: parent.height
-                    }
-                }
-            }
-
             Behavior on width {
                 PropertyAnimation {
                     id: anim
@@ -89,6 +74,50 @@ PanelWindow {
                     Layout.margins: 15
                     Layout.alignment: Qt.AlignBottom
 
+                    ListView {
+                        id: popupcol
+                        Layout.fillHeight: true
+                        Layout.fillWidth: true
+                        Layout.preferredHeight: 1000
+                        spacing: 10
+                        width: parent.width
+
+                        model: ListModel {
+                            id: list
+                            Component.onCompleted: () => {
+                                Notifications._.notification.connect(e => {
+                                    list.append({
+                                        notif: e
+                                    });
+                                });
+                            }
+                        }
+
+                        delegate: NotificationToast {
+                            id: toast
+
+                            required property int index
+
+                            width: ListView.view.width
+
+                            Component.onCompleted: {
+                                toast.notif.closed.connect(e => {
+                                    if (!toast)
+                                        return;
+
+                                    list.remove(toast.index, 1);
+                                });
+
+                                toast.close.connect(() => {
+                                    const notif = toast.notif;
+
+                                    list.remove(toast.index, 1);
+                                    notif.dismiss();
+                                });
+                            }
+                        }
+                    }
+
                     MprisSmall {}
                 }
             }

src/MainBar.qml

@@ -7,6 +7,7 @@ import "widgets/caffeine"
 import "windows/notificationtoast"
 import "windows/workspace-view"
 import "base"
+import "provider"
 import Quickshell // for ShellRoot and PanelWindow
 import QtQuick
 import QtQuick.Layouts
@@ -18,9 +19,11 @@ PanelWindow {
 
     anchors {
         top: true
-        left: true
+        left: Config.alignment === Config.BarAlignment.Left
+        right: Config.alignment === Config.BarAlignment.Right
         bottom: true
     }
+
     margins.left: 2
     margins.top: 2
     margins.bottom: 2
@@ -68,6 +71,7 @@ PanelWindow {
                 Layout.fillHeight: true
             }
         }
+
         MouseArea {
             id: mouse
             onClicked: lbar.root.enabled = !lbar.root.enabled

src/base/BRectangle.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import "../provider"
 
 Rectangle {
     width: parent.width
@@ -6,5 +7,5 @@ Rectangle {
     border.color: "black"
     border.width: 1
     radius: 5
-    color: "#BD93F9"
+    color: Config.colours.main
 }

src/provider/Config.qml

@@ -0,0 +1,22 @@
+pragma Singleton
+
+import QtQuick
+import Quickshell
+
+Singleton {
+    id: config
+    property Item notifications: Item {
+        property int toastDuration: 5000
+    }
+
+    enum BarAlignment {
+        Left,
+        Right
+    }
+
+    property int alignment: Config.BarAlignment.Left
+
+    property Item colours: Item {
+        property color main: "#BD93F9"
+    }
+}

src/provider/Notifications.qml

@@ -3,6 +3,7 @@ pragma Singleton
 import Quickshell.Services.Notifications
 import Quickshell
 import QtQuick
+import "../utils/timer.mjs" as Timer
 
 Singleton {
     id: notif
@@ -18,10 +19,15 @@ Singleton {
 
         onNotification: n => {
             n.tracked = true;
-            incoming.push(n);
+
+            notif.incomingAdded(n);
+
+            Timer.after(1000, notif, () => {
+                notif.incomingRemoved(n.id);
+            });
         }
     }
 
-    property list<Notification> backlog: notif._.trackedNotifications
+    signal incomingRemoved(id: int)
-    property list<Notification> incoming: []
+    signal incomingAdded(id: Notification)
 }

src/provider/qmldir

@@ -1,4 +1,5 @@
 module Provider
+singleton Config 0.1 Config.qml
 singleton Player 0.1 Player.qml
 singleton Inhibitor 0.1 Inhibitor.qml
 singleton Notifications 0.1 Notifications.qml

src/utils/qmldir

@@ -0,0 +1,2 @@
+module Utils
+Timer 0.1 timer.mjs

src/utils/timer.mjs

@@ -0,0 +1,13 @@
+export function Timer(parent) {
+  return Qt.createQmlObject("import QtQuick; Timer {}", parent);
+}
+
+export function after(delay, parent, callback) {
+  const timer = new Timer(parent);
+
+  timer.interval = delay;
+
+  timer.triggered.connect(callback);
+
+  timer.start();
+}

src/widgets/notifications/NotificationToast.qml

@@ -1,40 +1,30 @@
 pragma ComponentBehavior: Bound
 import QtQuick
-import QtQuick.Controls
 import QtQuick.Layouts
+import QtQuick.Controls
 import Quickshell
 import Quickshell.Widgets
 import "../../base"
+import "../../provider"
 import Quickshell.Services.Notifications
 
 MouseArea {
     id: toast
-    readonly property int lifetime: 5000
-    property int countdownTime: lifetime
 
-    required property string appName
+    required property Notification notif
-    required property string summary
+    property int actionHeight: 30
-    required property string body
+    property int expansionSpeed: 200
-    required property string appIcon
+    property bool showTimeBar: false
-    required property string image
-    required property NotificationUrgency urgency
-    required property bool hasActionIcons
-    required property var actions
-    required property int index
-    Component.onCompleted: () => console.log(toast.actions.values)
 
-    function close(): void {
-        popupcol.model.remove(toast.index, 1);
-    }
-
-    hoverEnabled: true
     height: box.height
-    width: popupcol.width
+    hoverEnabled: true
+
+    signal close
 
     BRectangle {
         id: box
         width: parent.width
-        height: header.height + actions.height + test.height + (5 * 3)
+        height: header.height + toast.actionHeight + bodyBox.height + (5 * 3)
 
         clip: true
 
@@ -49,32 +39,28 @@ MouseArea {
                 height: 25
 
                 IconImage {
-                    source: toast.appIcon ? Quickshell.iconPath(toast.appIcon) : ""
+                    source: toast.notif.appIcon ? Quickshell.iconPath(toast.notif.appIcon) : ""
                     height: parent.height
                     width: height
-                    visible: toast.appIcon
+                    visible: toast.notif.appIcon
                 }
 
                 Text {
-                    text: (toast.appIcon ? " " : toast.appName + ": ") + toast.summary
+                    text: `${toast.notif.appIcon ? "" : `${toast.notif.appName}:`} ${toast.notif.summary}`
                     Layout.fillWidth: true
                     elide: Text.ElideRight
                     font.pointSize: 12.5
                 }
 
-                Item {
+                Button {
-                    Layout.fillHeight: true
+                    onClicked: toast.close()
-                    Layout.rightMargin: 16
+                    height: 16
-                    Button {
+                    width: 16
-                        onClicked: toast.close()
-                        height: 16
-                        width: 16
-                    }
                 }
             }
 
             Rectangle {
-                id: test
+                id: bodyBox
                 width: parent.width
                 anchors.top: header.bottom
                 height: 60
@@ -85,17 +71,19 @@ MouseArea {
                 Text {
                     id: text
                     anchors.topMargin: 5
-                    text: toast.body
+                    text: toast.notif.body
                     width: parent.width
                     height: parent.height
                     wrapMode: Text.Wrap
                     elide: Text.ElideRight
                     font.pointSize: 12.5
+
                     Component.onCompleted: () => {
-                        if (text.implicitHeight < test.height) {
+                        if (text.implicitHeight < bodyBox.height) {
-                            test.height = text.implicitHeight;
+                            bodyBox.height = text.implicitHeight;
                         }
-                        test.maxHeight = text.implicitHeight;
+
+                        bodyBox.maxHeight = Qt.binding(() => text.implicitHeight);
                     }
                 }
 
@@ -103,62 +91,51 @@ MouseArea {
                     name: "expand"
                     when: toast.containsMouse
                     PropertyChanges {
-                        target: test
+                        target: bodyBox
-                        height: test.maxHeight
+                        height: bodyBox.maxHeight
                     }
                 }
 
                 transitions: Transition {
                     NumberAnimation {
-                        properties: "width,height"
+                        properties: "height"
-                        duration: 50
+                        duration: toast.expansionSpeed
-                        easing.type: Easing.InOutQuad
                     }
                 }
             }
-
             RowLayout {
                 id: actions
                 width: parent.width
-                anchors.top: test.bottom
+                anchors.top: bodyBox.bottom
                 anchors.topMargin: 5
                 anchors.bottomMargin: 5
                 Repeater {
-                    model: toast.actions
+                    id: rep
+                    model: toast.notif.actions
 
-                    delegate: ToastAction {
+                    delegate: NotificationToastAction {
                         required property var modelData
                         notifAction: modelData
-                        hasIcons: toast.hasActionIcons
+                        hasIcons: toast.notif.hasActionIcons
+                        height: toast.actionHeight
                     }
                 }
 
-                visible: toast?.actions ? true : false
+                visible: toast?.notif.actions ? true : false
-            }
-
-            states: State {
-                name: "expand"
-                when: toast.containsMouse
-                PropertyChanges {
-                    target: box
-                    height: test.height + header.height + actions.height + 15
-                }
-            }
-
-            transitions: Transition {
-                NumberAnimation {
-                    properties: "width,height"
-                    duration: 50
-                    easing.type: Easing.InOutQuad
-                }
             }
         }
 
+        NumberAnimation on width {
+            duration: toast.expansionSpeed
+        }
+
         Rectangle {
+            id: timeBar
+            visible: toast.showTimeBar
             anchors.margins: 2
             anchors.bottom: box.bottom
             anchors.right: box.right
-            width: (box.width - box.border.width - anchors.margins) * (toast.countdownTime / toast.lifetime)
+            width: box.width - box.border.width - anchors.margins
             height: 2
             bottomLeftRadius: box.radius
             bottomRightRadius: box.radius
@@ -174,21 +151,13 @@ MouseArea {
                     return "white";
                 }
             }
-        }
-    }
 
-    Timer {
+            NumberAnimation on width {
-        id: timer
+                to: 0
-        interval: 10
+                duration: Config.notifications.toastDuration
-        repeat: !toast.containsMouse
+                paused: toast.containsMouse && timeBar.visible
-        onTriggered: () => {
+                running: timeBar.visible
-            toast.countdownTime -= timer.interval;
-            if (toast.countdownTime <= 0) {
-                toast.parent.parent.model.remove(toast.index, 1);
-                timer.repeat = false;
-                timer.running = false;
             }
         }
-        running: !toast.containsMouse
     }
 }

src/windows/notificationtoast/NotificationToasts.qml

@@ -3,6 +3,7 @@ import Quickshell
 import QtQuick.Controls
 import "root:provider"
 import "root:base"
+import "../../widgets/notifications"
 
 PanelWindow {
     id: popups
@@ -36,11 +37,15 @@ PanelWindow {
             anchors.margins: lbar.width * 0.2
             anchors.fill: parent
             focus: true
+            spacing: 10
+
             model: ListModel {
                 id: data
                 Component.onCompleted: () => {
-                    Notifications._.notification.connect(e => {
+                    Notifications.incomingAdded.connect(n => {
-                        data.insert(0, e);
+                        data.insert(0, {
+                            notif: n
+                        });
                     });
                 }
             }
@@ -80,8 +85,34 @@ PanelWindow {
                 }
             }
 
-            spacing: 10
+            delegate: NotificationToast {
-            delegate: Toast {}
+                id: toast
+
+                property int countdownTime: Config.notifications.toastDuration
+                required property int index
+
+                width: ListView.view.width
+                showTimeBar: true
+
+                Timer {
+                    id: timer
+                    interval: 100
+                    onTriggered: () => {
+                        toast.countdownTime -= interval;
+                        if (toast.countdownTime <= 0) {
+                            toast.close();
+                        }
+                    }
+                    repeat: true
+                    running: !toast.containsMouse && toast.countdownTime > 0
+                }
+
+                Component.onCompleted: {
+                    toast.close.connect(() => {
+                        popupcol.model.remove(toast.index, 1);
+                    });
+                }
+            }
         }
     }
 }