diff --git a/applets/notifications/package/contents/ui/FullRepresentation.qml b/applets/notifications/package/contents/ui/FullRepresentation.qml --- a/applets/notifications/package/contents/ui/FullRepresentation.qml +++ b/applets/notifications/package/contents/ui/FullRepresentation.qml @@ -40,6 +40,28 @@ readonly property int dndEveningHour: 20 Layout.fillHeight: plasmoid.formFactor === PlasmaCore.Types.Vertical + // HACK forward focus to the list + onActiveFocusChanged: { + if (activeFocus) { + list.forceActiveFocus(); + } + } + + Connections { + target: plasmoid + onExpandedChanged: { + if (plasmoid.expanded) { + list.positionViewAtBeginning(); + list.currentIndex = -1; + } + } + } + + PlasmaCore.Svg { + id: lineSvg + imagePath: "widgets/line" + } + header: PlasmaExtras.PlasmoidHeading { ColumnLayout { anchors.fill: parent @@ -248,23 +270,6 @@ spacing: units.smallSpacing - // HACK forward focus to the list - onActiveFocusChanged: { - if (activeFocus) { - list.forceActiveFocus(); - } - } - - Connections { - target: plasmoid - onExpandedChanged: { - if (plasmoid.expanded) { - list.positionViewAtBeginning(); - list.currentIndex = -1; - } - } - } - // actual notifications PlasmaExtras.ScrollArea { Layout.fillWidth: true diff --git a/applets/notifications/package/contents/ui/NotificationHeader.qml b/applets/notifications/package/contents/ui/NotificationHeader.qml --- a/applets/notifications/package/contents/ui/NotificationHeader.qml +++ b/applets/notifications/package/contents/ui/NotificationHeader.qml @@ -92,6 +92,7 @@ PlasmaExtras.DescriptiveLabel { id: applicationNameLabel + Layout.fillWidth: true textFormat: Text.PlainText elide: Text.ElideLeft text: notificationHeading.applicationName + (notificationHeading.originName ? " ยท " + notificationHeading.originName : "") diff --git a/applets/notifications/package/contents/ui/NotificationItem.qml b/applets/notifications/package/contents/ui/NotificationItem.qml --- a/applets/notifications/package/contents/ui/NotificationItem.qml +++ b/applets/notifications/package/contents/ui/NotificationItem.qml @@ -111,16 +111,29 @@ spacing: 0 - PlasmaExtras.PlasmoidHeading { - bottomInset: 0 - bottomPadding: 0 - Layout.leftMargin: notificationItem.headingLeftPadding - Layout.rightMargin: notificationItem.headingRightPadding - background.visible: !notificationItem.inGroup + Item { + Layout.fillWidth: true + Layout.preferredHeight: notificationHeading.implicitHeight + Layout.preferredWidth: notificationHeading.implicitWidth + id: headingElement + + PlasmaCore.FrameSvgItem { + imagePath: "widgets/plasmoidheading" + prefix: 'header' + anchors.fill: parent + anchors.topMargin: -margins.top + anchors.leftMargin: -margins.left + anchors.rightMargin: -margins.right + visible: !notificationItem.inGroup && fromCurrentTheme + } NotificationHeader { id: notificationHeading - anchors.fill: parent + anchors { + fill: parent + leftMargin: notificationItem.headingLeftPadding + rightMargin: notificationItem.headingRightPadding + } inGroup: notificationItem.inGroup @@ -156,8 +169,8 @@ PlasmaExtras.Heading { id: summaryLabel - Layout.fillWidth: true Layout.preferredHeight: implicitHeight + Layout.fillWidth: true textFormat: Text.PlainText maximumLineCount: 3 wrapMode: Text.WordWrap @@ -431,7 +444,7 @@ State { when: notificationItem.inGroup PropertyChanges { - target: notificationHeading + target: headingElement parent: summaryRow }