ZacharyZhang-NY/omarchycn
4
5
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 5 Wiki Activity

Keep glyph-only notifications compact

Browse Source
This commit is contained in:
David Heinemeier Hansson
2026-05-22 10:16:29 +02:00
parent 336e7a790f
commit a12fdf96c4
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/plugins/notifications/components/NotificationCard.qml
+9 -6
View File
@@ -40,6 +40,9 @@ Rectangle {
readonly property string smallIconSource: image.length > 0 ? image : appIcon readonly property string smallIconSource: image.length > 0 ? image : appIcon
readonly property bool hasGlyph: glyph.length > 0 readonly property bool hasGlyph: glyph.length > 0
readonly property bool hasSmallIcon: smallIconSource.length > 0 || hasGlyph readonly property bool hasSmallIcon: smallIconSource.length > 0 || hasGlyph
readonly property bool summaryStartsWithGlyph: /^\s*\S\s{2,}/.test(summary)
readonly property bool singleLineToast: sanitizedBody.length === 0
readonly property bool collapseRedundantIcon: singleLineToast && !hasGlyph && summaryStartsWithGlyph
readonly property bool chromiumDerived: { readonly property bool chromiumDerived: {
var source = (app + "\n" + appIcon).toLowerCase() var source = (app + "\n" + appIcon).toLowerCase()
return source.indexOf("chrom") >= 0 || source.indexOf("brave") >= 0 || return source.indexOf("chrom") >= 0 || source.indexOf("brave") >= 0 ||
@@ -99,19 +102,19 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
Layout.leftMargin: Style.space(12) Layout.leftMargin: Style.space(12)
Layout.rightMargin: Style.space(12) Layout.rightMargin: Style.space(12)
Layout.topMargin: Style.space(10) Layout.topMargin: root.singleLineToast ? Style.space(7) : Style.space(10)
Layout.bottomMargin: Style.space(10) Layout.bottomMargin: root.singleLineToast ? Style.space(7) : Style.space(10)
spacing: Style.space(12) spacing: root.collapseRedundantIcon ? 0 : Style.space(12)
Item { Item {
id: smallIconSlot id: smallIconSlot
Layout.preferredWidth: Style.space(40) Layout.preferredWidth: visible ? Style.space(40) : 0
Layout.preferredHeight: Style.space(40) Layout.preferredHeight: visible ? Style.space(40) : 0
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
// Hide the slot when the icon failed to resolve (themed-icon name // Hide the slot when the icon failed to resolve (themed-icon name
// not in the user's icon theme) AND we don't have a glyph fallback // not in the user's icon theme) AND we don't have a glyph fallback
// — prevents rendering Qt's pink broken-image placeholder. // — prevents rendering Qt's pink broken-image placeholder.
visible: root.hasSmallIcon && (root.hasGlyph || smallIconImage.status !== Image.Error) visible: !root.collapseRedundantIcon && root.hasSmallIcon && (root.hasGlyph || smallIconImage.status !== Image.Error)
Image { Image {
id: smallIconImage id: smallIconImage