diff --git a/modules/NotifCard.qml b/modules/NotifCard.qml index e908572..fa4b8da 100644 --- a/modules/NotifCard.qml +++ b/modules/NotifCard.qml @@ -121,7 +121,7 @@ Item { anchors.right: parent.right anchors.top: parent.top anchors.leftMargin: _icon.visible ? 8 : 14 - anchors.rightMargin: 20 + anchors.rightMargin: 12 anchors.topMargin: 8 spacing: 2 diff --git a/modules/NotifCenter.qml b/modules/NotifCenter.qml index 0ba2372..8b54608 100644 --- a/modules/NotifCenter.qml +++ b/modules/NotifCenter.qml @@ -116,7 +116,7 @@ M.HoverPanel { appIcon: g.appIcon, count: g.notifs.length, collapsed: collapsed, - summaries: g.notifs.map(n => n.summary || "") + summaries: g.notifs.map(n => n.summary || "").filter(Boolean).join(" ยท ") }); if (!collapsed) { for (const n of g.notifs) @@ -241,7 +241,7 @@ M.HoverPanel { readonly property real _targetHeight: { if (_type === "header") - return modelData.collapsed ? (28 + modelData.count * (M.Theme.fontSize + 4)) : 28; + return modelData.collapsed ? (28 + M.Theme.fontSize + 4) : 28; return _notifCard.implicitHeight; } @@ -339,7 +339,6 @@ M.HoverPanel { color: M.Theme.base04 font.pixelSize: M.Theme.fontSize - 2 font.family: M.Theme.fontFamily - opacity: _headerHover.hovered ? 1 : 0 } // App name @@ -386,26 +385,22 @@ M.HoverPanel { } } - // Collapsed preview: one line per notification summary - Repeater { - model: (notifDelegate._type === "header" && notifDelegate.modelData.collapsed) ? notifDelegate.modelData.summaries : [] - - Text { - required property string modelData - required property int index - anchors.left: parent.left - anchors.leftMargin: 10 - anchors.right: parent.right - anchors.rightMargin: 10 - y: 28 + index * (M.Theme.fontSize + 4) - height: M.Theme.fontSize + 4 - verticalAlignment: Text.AlignVCenter - text: modelData - elide: Text.ElideRight - font.pixelSize: M.Theme.fontSize - 2 - font.family: M.Theme.fontFamily - color: M.Theme.base04 - } + // Collapsed preview: notification summaries on a subtitle row + Text { + visible: notifDelegate._type === "header" && notifDelegate.modelData.collapsed + anchors.left: parent.left + anchors.leftMargin: 10 + anchors.right: parent.right + anchors.rightMargin: 10 + anchors.top: parent.top + anchors.topMargin: 28 + height: M.Theme.fontSize + 4 + verticalAlignment: Text.AlignVCenter + text: notifDelegate._type === "header" ? (notifDelegate.modelData.summaries ?? "") : "" + elide: Text.ElideRight + font.pixelSize: M.Theme.fontSize - 2 + font.family: M.Theme.fontFamily + color: M.Theme.base04 } } diff --git a/modules/NotifPopup.qml b/modules/NotifPopup.qml index c811ad5..b7a2779 100644 --- a/modules/NotifPopup.qml +++ b/modules/NotifPopup.qml @@ -10,7 +10,7 @@ PanelWindow { required property var screen - visible: M.NotifService.popups.length > 0 && !M.NiriIpc.overviewOpen + visible: M.NotifService.popups.length > 0 color: "transparent" WlrLayershell.layer: WlrLayer.Overlay