lucy/quickshell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge issue

Browse Source
This commit is contained in:
lucy 2026-03-27 16:05:37 +01:00
commit 1d018f6cd6
2 changed files with 49 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
modules/notifications/NotificationCard.qml
View File

@ -21,64 +21,69 @@ Rectangle {
running: true running: true
onTriggered: notifyItem.modelData.expire() onTriggered: notifyItem.modelData.expire()
} }
RowLayout { RowLayout {
id: fullLayout id: fullLayout
anchors.margins: 20 anchors.margins: 20
anchors.fill: parent anchors.fill: parent
anchors.centerIn: parent
spacing: 10 spacing: 10
ClippingWrapperRectangle {
id: notiIconWrapper
Layout.alignment: Qt.AlignTop
radius: notifyItem.radius - notifyItem.radius / 3
implicitWidth: notiIcon.implicitSize
color: "transparent"
implicitHeight: notiIcon.implicitSize
visible: notifyItem.modelData.image !== ""
IconImage {
id: notiIcon
source: notifyItem.modelData.image !== "" ? notifyItem.modelData.image : Quickshell.iconPath("preferences-desktop-notification-bell")
implicitSize: 64
asynchronous: true
}
}
ColumnLayout { ColumnLayout {
id: textLayout id: textLayout
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignTop
spacing: 0 spacing: 0
CText { // New RowLayout to hold the Icon and App Name together
id: appName RowLayout {
text: notifyItem.modelData.appName id: iconTextLayout
opacity: 0.5 spacing: 8
font.pixelSize: 10
} ClippingWrapperRectangle {
CText { id: notiIconWrapper
id: summary radius: notifyItem.radius - notifyItem.radius / 3
text: notifyItem.modelData.summary implicitWidth: notiIcon.implicitSize
font.bold: true implicitHeight: notiIcon.implicitSize
elide: Text.ElideRight color: "transparent"
Layout.fillWidth: true
Layout.bottomMargin: 0 child: IconImage {
Layout.topMargin: 5 id: notiIcon
maximumLineCount: 1 // Keep your existing source logic
onTextChanged: { source: notifyItem.modelData.image !== "" ? notifyItem.modelData.image : Quickshell.iconPath("/usr/share/icons/Papirus/24x24/panel/notifications.svg")
dismissTimer.restart(); implicitSize: 22 // Slightly smaller to match text height
asynchronous: true
}
}
CText {
id: appName
text: notifyItem.modelData.appName
opacity: 0.5
font.pixelSize: 10
} }
} }
ColumnLayout {
spacing: 0
Layout.alignment: Qt.AlignHCenter
Layout.leftMargin: notiIcon.implicitWidth + iconTextLayout.spacing
CText {
id: summary
text: notifyItem.modelData.summary
font.bold: true
elide: Text.ElideRight
Layout.fillWidth: true
Layout.topMargin: 5
}
CText { CText {
text: notifyItem.modelData.body text: notifyItem.modelData.body
font.pixelSize: Settings.config.fontSize - 2 font.pixelSize: Settings.config.fontSize - 2
maximumLineCount: 1 maximumLineCount: 1
opacity: 0.3 opacity: 0.3
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
elide: Text.ElideRight elide: Text.ElideRight
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter
}
} }
} }
} }

2
settings/settings.json
View File

@ -2,7 +2,7 @@
"barHeight": 32, "barHeight": 32,
"barSpacing": 10, "barSpacing": 10,
"barmargins": 6, "barmargins": 6,
"currentWall": "/home/lucy/.walls/mooon.png", "currentWall": "/home/lucy/.walls/frierensuff.png",
"floating": true, "floating": true,
"font": "Google Sans", "font": "Google Sans",
"fontSize": 13, "fontSize": 13,