kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

notif actions

Browse Source
This commit is contained in:
end-4
2025-04-19 21:38:33 +02:00
parent 3b2628fbd7
commit 3677873a05
4 changed files with 109 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/quickshell/modules/common/Appearance.qml
+3 -1
View File
@@ -127,8 +127,10 @@ Singleton {
property color colPrimaryContainerActive: mix(m3colors.m3primaryContainer, colLayer1Active, 0.6)
property color colSecondaryHover: mix(m3colors.m3secondary, colLayer1Hover, 0.85)
property color colSecondaryActive: mix(m3colors.m3secondary, colLayer1Active, 0.4)
property color colSecondaryContainerHover: mix(m3colors.m3secondaryContainer, colLayer1Hover, 0.8)
property color colSecondaryContainerHover: mix(m3colors.m3secondaryContainer, colLayer1Hover, 0.67)
property color colSecondaryContainerActive: mix(m3colors.m3secondaryContainer, colLayer1Active, 0.6)
property color colSurfaceContainerHighestHover: mix(m3colors.m3surfaceContainerHighest, m3colors.m3onSurface, 0.9)
property color colSurfaceContainerHighestActive: mix(m3colors.m3surfaceContainerHighest, m3colors.m3onSurface, 0.82)
property color colTooltip: m3colors.m3inverseSurface
property color colOnTooltip: m3colors.m3inverseOnSurface
property color colScrim: transparentize(m3colors.m3scrim, 0.5)
.config/quickshell/modules/common/widgets/NotificationActionButton.qml
+34
View File
@@ -0,0 +1,34 @@
import "root:/modules/common"
import "root:/services"
import QtQuick
import QtQuick.Controls
import QtQuick.Layouts
import Quickshell
import Quickshell.Services.Notifications
Button {
id: button
property string buttonText
property string urgency
implicitHeight: 30
leftPadding: 10
rightPadding: 10
background: Rectangle {
radius: Appearance.rounding.small
color: (urgency == NotificationUrgency.Critical) ?
(button.down ? Appearance.colors.colSecondaryContainerActive :
button.hovered ? Appearance.colors.colSecondaryContainerHover :
Appearance.m3colors.m3secondaryContainer) :
(button.down ? Appearance.colors.colSurfaceContainerHighestActive :
button.hovered ? Appearance.colors.colSurfaceContainerHighestHover :
Appearance.m3colors.m3surfaceContainerHighest)
}
contentItem: StyledText {
horizontalAlignment: Text.AlignHCenter
text: buttonText
color: (urgency == NotificationUrgency.Critical) ? Appearance.m3colors.m3onSurfaceVariant : Appearance.m3colors.m3onSurface
}
}
.config/quickshell/modules/common/widgets/NotificationWidget.qml
+55 -14
View File
@@ -24,8 +24,8 @@ Item {
Behavior on implicitHeight {
enabled: enableAnimation
NumberAnimation {
duration: Appearance.animation.elementDecel.duration
easing.type: Appearance.animation.elementDecel.type
duration: Appearance.animation.elementDecelFast.duration
easing.type: Appearance.animation.elementDecelFast.type
}
}
@@ -42,7 +42,7 @@ Item {
Timer {
id: destroyTimer
interval: Appearance.animation.elementDecel.duration
interval: Appearance.animation.elementDecelFast.duration
repeat: false
onTriggered: {
root.destroy()
@@ -51,11 +51,12 @@ Item {
MouseArea { // Middle click to close
anchors.fill: parent
acceptedButtons: Qt.MiddleButton
acceptedButtons: Qt.MiddleButton | Qt.RightButton
onClicked: (mouse) => {
if (mouse.button == Qt.MiddleButton) {
Notifications.discardNotification(notificationObject.id)
}
if (mouse.button == Qt.MiddleButton)
Notifications.discardNotification(notificationObject.id);
else if (mouse.button == Qt.RightButton)
root.expanded = !root.expanded;
}
}
@@ -64,7 +65,7 @@ Item {
anchors.fill: parent
anchors.topMargin: notificationListSpacing
color: (notificationObject.urgency == NotificationUrgency.Critical) ?
Appearance.m3colors.m3secondaryContainer : Appearance.colors.colLayer2
Appearance.mix(Appearance.m3colors.m3secondaryContainer, Appearance.colors.colLayer2, 0.35) : Appearance.colors.colLayer2
radius: Appearance.rounding.normal
}
@@ -92,14 +93,15 @@ Item {
Layout.alignment: Qt.AlignTop
Layout.fillWidth: false
radius: Appearance.rounding.full
color: (notificationObject.urgency == NotificationUrgency.Critical) ?
Appearance.m3colors.m3secondary : Appearance.m3colors.m3secondaryContainer
color: Appearance.m3colors.m3secondaryContainer
MaterialSymbol {
visible: notificationObject.appIcon == ""
text: NotificationUtils.guessMessageType(notificationObject.summary)
text: (notificationObject.urgency == NotificationUrgency.Critical) ? "release_alert" :
NotificationUtils.guessMessageType(notificationObject.summary)
anchors.fill: parent
color: (notificationObject.urgency == NotificationUrgency.Critical) ?
Appearance.m3colors.m3onSecondary : Appearance.m3colors.m3onSecondaryContainer
Appearance.mix(Appearance.m3colors.m3onSecondary, Appearance.m3colors.m3onSecondaryContainer, 0.1) :
Appearance.m3colors.m3onSecondaryContainer
font.pixelSize: 27
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
@@ -192,17 +194,56 @@ Item {
StyledText { // Notification body
Layout.fillWidth: true
Layout.bottomMargin: 10
Layout.leftMargin: 10
Layout.rightMargin: 10
Layout.bottomMargin: 10
clip: true
wrapMode: expanded ? Text.Wrap : Text.NoWrap
elide: Text.ElideRight
font.pixelSize: Appearance.font.pixelSize.small
horizontalAlignment: Text.AlignLeft
color: Appearance.m3colors.m3outline
// textFormat: Text.MarkdownText
text: notificationObject.body
text: notificationObject.body
}
Flickable {
Layout.fillWidth: true
Layout.topMargin: -5
Layout.leftMargin: 10
Layout.rightMargin: 10
Layout.bottomMargin: 10
visible: expanded
implicitHeight: actionRowLayout.implicitHeight
contentWidth: actionRowLayout.implicitWidth
RowLayout { // Actions
id: actionRowLayout
Repeater {
id: actionRepeater
model: notificationObject.actions
NotificationActionButton {
Layout.fillWidth: true
buttonText: modelData.text
urgency: notificationObject.urgency
onClicked: {
Notifications.attemptInvokeAction(notificationObject.id, modelData.identifier);
}
}
}
NotificationActionButton {
Layout.fillWidth: true
buttonText: "Close"
urgency: notificationObject.urgency
onClicked: {
Notifications.discardNotification(notificationObject.id);
}
}
}
}
}
}
.config/quickshell/services/Notifications.qml
+17 -2
View File
@@ -19,7 +19,7 @@ Singleton {
NotificationServer {
id: notifServer
// actionIconsSupported: true
// actionsSupported: true
actionsSupported: true
bodyHyperlinksSupported: true
// bodyImagesSupported: true
bodyMarkupSupported: true
@@ -32,7 +32,12 @@ Singleton {
notification.tracked = true
const newNotifObject = {
"id": notification.id,
"actions": [],
"actions": notification.actions.map((action) => {
return {
"identifier": action.identifier,
"text": action.text,
}
}),
"appIcon": notification.appIcon,
"appName": notification.appName,
"body": notification.body,
@@ -60,6 +65,16 @@ Singleton {
root.discard(id);
}
function attemptInvokeAction(id, notifIdentifier) {
const notifServerIndex = notifServer.trackedNotifications.values.findIndex((notif) => notif.id === id);
if (notifServerIndex !== -1) {
const notifServerNotif = notifServer.trackedNotifications.values[notifServerIndex];
const action = notifServerNotif.actions.find((action) => action.identifier === notifIdentifier);
action.invoke()
} else console.log("Notification not found in server: " + id)
root.discard(id);
}
function triggerListChange() {
root.list = root.list.slice(0)
}