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/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,26 +111,39 @@ spacing: 0 - PlasmaExtras.PlasmoidHeading { - bottomInset: 0 - bottomPadding: 0 - Layout.leftMargin: notificationItem.headingLeftPadding - Layout.rightMargin: notificationItem.headingRightPadding - background.visible: !notificationItem.inGroup - - NotificationHeader { - id: notificationHeading + Item { + Layout.fillWidth: true + implicitHeight: !notificationItem.inGroup ? notificationHeading.implicitHeight : 0 + + 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 + } - inGroup: notificationItem.inGroup + RowLayout { + anchors.fill: parent - notificationType: notificationItem.notificationType - jobState: notificationItem.jobState - jobDetails: notificationItem.jobDetails + NotificationHeader { + id: notificationHeading + Layout.fillWidth: true + Layout.leftMargin: notificationItem.headingLeftPadding + Layout.rightMargin: notificationItem.headingRightPadding + + inGroup: notificationItem.inGroup - onConfigureClicked: notificationItem.configureClicked() - onDismissClicked: notificationItem.dismissClicked() - onCloseClicked: notificationItem.closeClicked() + notificationType: notificationItem.notificationType + jobState: notificationItem.jobState + jobDetails: notificationItem.jobDetails + + onConfigureClicked: notificationItem.configureClicked() + onDismissClicked: notificationItem.dismissClicked() + onCloseClicked: notificationItem.closeClicked() + } } }