Compare commits

..

No commits in common. "1c67f002f42439fffd22c928ccfdd8ce1197ff7e" and "51a6323b6662b0ae8826fa91c38efb2205086f9a" have entirely different histories.

2 changed files with 2 additions and 12 deletions

View file

@ -11,7 +11,6 @@ Item {
required property var notif // NotifItem (may be null all accesses use ?.) required property var notif // NotifItem (may be null all accesses use ?.)
property bool showAppName: true property bool showAppName: true
property bool dismissOnAction: true
property int iconSize: 32 property int iconSize: 32
property int bodyMaxLines: 3 property int bodyMaxLines: 3
property color accentColor: M.Theme.base0D property color accentColor: M.Theme.base0D
@ -25,12 +24,6 @@ Item {
id: _hover id: _hover
} }
TapHandler {
acceptedButtons: Qt.RightButton
cursorShape: Qt.PointingHandCursor
onTapped: root.dismissRequested()
}
// Background: base01, base02 on hover // Background: base01, base02 on hover
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
@ -145,8 +138,7 @@ Item {
const def = root.notif?.actions?.find(a => a.identifier === "default"); const def = root.notif?.actions?.find(a => a.identifier === "default");
if (def) { if (def) {
def.invoke(); def.invoke();
if (root.dismissOnAction) root.dismissRequested();
root.dismissRequested();
} }
} }
} }
@ -265,8 +257,7 @@ Item {
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onTapped: { onTapped: {
parent.modelData.invoke(); parent.modelData.invoke();
if (root.dismissOnAction) M.NotifService.dismiss(root.notif.id);
root.dismissRequested();
} }
} }
} }

View file

@ -418,7 +418,6 @@ M.HoverPanel {
anchors.leftMargin: 8 anchors.leftMargin: 8
notif: notifDelegate._notif notif: notifDelegate._notif
showAppName: false showAppName: false
dismissOnAction: false
iconSize: 24 iconSize: 24
bodyMaxLines: 2 bodyMaxLines: 2
onDismissRequested: notifDelegate.dismiss() onDismissRequested: notifDelegate.dismiss()