diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp index 9c78bb6bd1..44217b2c83 100644 --- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp +++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp @@ -578,21 +578,20 @@ void Decoration::updateBlur() QRegion mask; - const QVariant maskProperty = m_item->property("decorationMask"); - if (static_cast(maskProperty.type()) == QMetaType::QRegion) { - mask = maskProperty.value(); + if (clientPointer() && clientPointer()->isMaximized()) { + mask = QRect(0, 0, m_item->width(), m_item->height()); + } else { + const QVariant maskProperty = m_item->property("decorationMask"); + if (static_cast(maskProperty.type()) == QMetaType::QRegion) { + mask = maskProperty.value(); - if (!mask.isNull()) { - QPoint maskOffset(-m_padding->left(), -m_padding->top()); - - if (clientPointer() && !clientPointer()->isMaximized()) { + if (!mask.isNull()) { // moving mask by 1,1 because mask size has already been adjusted to be smaller than the frame. // Since the svg will have antialiasing and the mask not, there will be artifacts at the corners, // if they go under the svg they're less evident. - maskOffset += QPoint(1, 1); + QPoint maskOffset(-m_padding->left()+1, -m_padding->top()+1); + mask.translate(maskOffset); } - - mask.translate(maskOffset); } } diff --git a/src/plugins/kdecorations/aurorae/src/qml/aurorae.qml b/src/plugins/kdecorations/aurorae/src/qml/aurorae.qml index f1254669d0..e167e5ec61 100644 --- a/src/plugins/kdecorations/aurorae/src/qml/aurorae.qml +++ b/src/plugins/kdecorations/aurorae/src/qml/aurorae.qml @@ -223,9 +223,9 @@ Decoration { anchors.fill: parent // This makes the mask slightly smaller than the frame. Since the svg will have antialiasing and the mask not, // there will be artifacts at the corners, if they go under the svg they're less evident - anchors.margins: decoration.client.maximized ? 0 : 1 + anchors.margins: 1 imagePath: backgroundSvg.imagePath opacity: 0 - enabledBorders: decoration.client.maximized ? PlasmaCore.FrameSvg.NoBorder : PlasmaCore.FrameSvg.TopBorder | PlasmaCore.FrameSvg.BottomBorder | PlasmaCore.FrameSvg.LeftBorder | PlasmaCore.FrameSvg.RightBorder + enabledBorders: PlasmaCore.FrameSvg.TopBorder | PlasmaCore.FrameSvg.BottomBorder | PlasmaCore.FrameSvg.LeftBorder | PlasmaCore.FrameSvg.RightBorder } }