Compare commits

..

4 commits

3 changed files with 25 additions and 20 deletions

View file

@ -121,7 +121,7 @@ Item {
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
anchors.leftMargin: _icon.visible ? 8 : 14 anchors.leftMargin: _icon.visible ? 8 : 14
anchors.rightMargin: 12 anchors.rightMargin: 20
anchors.topMargin: 8 anchors.topMargin: 8
spacing: 2 spacing: 2

View file

@ -116,7 +116,7 @@ M.HoverPanel {
appIcon: g.appIcon, appIcon: g.appIcon,
count: g.notifs.length, count: g.notifs.length,
collapsed: collapsed, collapsed: collapsed,
summaries: g.notifs.map(n => n.summary || "").filter(Boolean).join(" · ") summaries: g.notifs.map(n => n.summary || "")
}); });
if (!collapsed) { if (!collapsed) {
for (const n of g.notifs) for (const n of g.notifs)
@ -241,7 +241,7 @@ M.HoverPanel {
readonly property real _targetHeight: { readonly property real _targetHeight: {
if (_type === "header") if (_type === "header")
return modelData.collapsed ? (28 + M.Theme.fontSize + 4) : 28; return modelData.collapsed ? (28 + modelData.count * (M.Theme.fontSize + 4)) : 28;
return _notifCard.implicitHeight; return _notifCard.implicitHeight;
} }
@ -339,6 +339,7 @@ M.HoverPanel {
color: M.Theme.base04 color: M.Theme.base04
font.pixelSize: M.Theme.fontSize - 2 font.pixelSize: M.Theme.fontSize - 2
font.family: M.Theme.fontFamily font.family: M.Theme.fontFamily
opacity: _headerHover.hovered ? 1 : 0
} }
// App name // App name
@ -385,22 +386,26 @@ M.HoverPanel {
} }
} }
// Collapsed preview: notification summaries on a subtitle row // Collapsed preview: one line per notification summary
Text { Repeater {
visible: notifDelegate._type === "header" && notifDelegate.modelData.collapsed model: (notifDelegate._type === "header" && notifDelegate.modelData.collapsed) ? notifDelegate.modelData.summaries : []
anchors.left: parent.left
anchors.leftMargin: 10 Text {
anchors.right: parent.right required property string modelData
anchors.rightMargin: 10 required property int index
anchors.top: parent.top anchors.left: parent.left
anchors.topMargin: 28 anchors.leftMargin: 10
height: M.Theme.fontSize + 4 anchors.right: parent.right
verticalAlignment: Text.AlignVCenter anchors.rightMargin: 10
text: notifDelegate._type === "header" ? (notifDelegate.modelData.summaries ?? "") : "" y: 28 + index * (M.Theme.fontSize + 4)
elide: Text.ElideRight height: M.Theme.fontSize + 4
font.pixelSize: M.Theme.fontSize - 2 verticalAlignment: Text.AlignVCenter
font.family: M.Theme.fontFamily text: modelData
color: M.Theme.base04 elide: Text.ElideRight
font.pixelSize: M.Theme.fontSize - 2
font.family: M.Theme.fontFamily
color: M.Theme.base04
}
} }
} }

View file

@ -10,7 +10,7 @@ PanelWindow {
required property var screen required property var screen
visible: M.NotifService.popups.length > 0 visible: M.NotifService.popups.length > 0 && !M.NiriIpc.overviewOpen
color: "transparent" color: "transparent"
WlrLayershell.layer: WlrLayer.Overlay WlrLayershell.layer: WlrLayer.Overlay