diff --git a/src/declarativeimports/plasmaextracomponents/qml/PlasmoidHeading.qml b/src/declarativeimports/plasmaextracomponents/qml/PlasmoidHeading.qml --- a/src/declarativeimports/plasmaextracomponents/qml/PlasmoidHeading.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/PlasmoidHeading.qml @@ -52,20 +52,32 @@ property int location: PlasmoidHeading.Location.Header Layout.fillWidth: true - bottomPadding: location == PlasmoidHeading.Location.Footer ? 0 : headingSvg.margins.top - topPadding: location == PlasmoidHeading.Location.Footer ? headingSvg.margins.bottom : 0 + bottomPadding: location == PlasmoidHeading.Location.Footer ? 0 : headingSvg.fixedMargins.top + topPadding: location == PlasmoidHeading.Location.Footer ? headingSvg.fixedMargins.bottom : 0 implicitHeight: contentHeight + topPadding + bottomPadding contentHeight: contentItem.implicitHeight || (contentChildren.length === 1 ? contentChildren[0].implicitHeight : 0) leftInset: -headingSvg.fixedMargins.left rightInset: -headingSvg.fixedMargins.right - topInset: location == PlasmoidHeading.Location.Footer ? 0 : -headingSvg.margins.top + topInset: location == PlasmoidHeading.Location.Footer ? 0 : -headingSvg.fixedMargins.top bottomInset: location == PlasmoidHeading.Location.Footer ? -headingSvg.fixedMargins.bottom : 0 background: PlasmaCore.FrameSvgItem { id: headingSvg imagePath: "widgets/plasmoidheading" prefix: location == PlasmoidHeading.Location.Header? 'header' : 'footer' + enabledBorders: { + var borders = 0 + borders |= PlasmaCore.FrameSvg.LeftBorder + borders |= PlasmaCore.FrameSvg.RightBorder + if (plasmoid.location !== PlasmaCore.Types.TopEdge || location != PlasmoidHeading.Location.Header) { + borders |= PlasmaCore.FrameSvg.TopBorder + } + if (plasmoid.location !== PlasmaCore.Types.BottomEdge || location != PlasmoidHeading.Location.Footer) { + borders |= PlasmaCore.FrameSvg.BottomBorder + } + return borders + } } } diff --git a/src/desktoptheme/breeze/widgets/plasmoidheading.svg b/src/desktoptheme/breeze/widgets/plasmoidheading.svg --- a/src/desktoptheme/breeze/widgets/plasmoidheading.svg +++ b/src/desktoptheme/breeze/widgets/plasmoidheading.svg @@ -5,45 +5,45 @@ .ColorScheme-Background { color:#eff0f1; } - - - - + + + + - - + + - + - - + + - - + + - - - - - + + + + + - - + + - + - - + + - - + + - - - - - - + + + + + +