From 219c1b5e056022d060152f39915f96d83bcba8bc Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 27 Feb 2021 13:18:58 +0200 Subject: [PATCH] do not draw indicatorPaddings for PlasmaAutoFill --- containment/package/contents/ui/applet/AppletItem.qml | 10 ++++++++-- .../package/contents/ui/applet/IndicatorLevel.qml | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index 3ab1d3fd3..a24781dfa 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -188,6 +188,7 @@ Item { || (root.behaveAsDockWithMask && !parabolicEffectIsSupported) || (root.behaveAsDockWithMask && parabolicEffectIsSupported && lockZoom) + readonly property bool isIndicatorDrawn: indicatorBackLayer.level.isDrawn readonly property bool isSquare: parabolicEffectIsSupported readonly property bool screenEdgeMarginSupported: communicator.requires.screenEdgeMarginSupported || communicator.indexerIsSupported @@ -280,8 +281,13 @@ Item { //! local margins readonly property bool parabolicEffectMarginsEnabled: appletItem.parabolic.factor.zoom>1 && !originalAppletBehavior && !communicator.parabolicEffectIsSupported - property int lengthAppletPadding: metrics.fraction.lengthAppletPadding === -1 || parabolicEffectMarginsEnabled ? - metrics.padding.length : metrics.padding.lengthApplet + property int lengthAppletPadding:{ + if (!isIndicatorDrawn) { + return 0; + } + + return metrics.fraction.lengthAppletPadding === -1 || parabolicEffectMarginsEnabled ? metrics.padding.length : metrics.padding.lengthApplet; + } property int lengthAppletFullMargin: 0 property int lengthAppletFullMargins: 2 * lengthAppletFullMargin diff --git a/containment/package/contents/ui/applet/IndicatorLevel.qml b/containment/package/contents/ui/applet/IndicatorLevel.qml index 732ad6337..243b68bf2 100644 --- a/containment/package/contents/ui/applet/IndicatorLevel.qml +++ b/containment/package/contents/ui/applet/IndicatorLevel.qml @@ -59,6 +59,7 @@ AbilityItem.IndicatorLevel { level.isDrawn: !appletItem.isSeparator && !appletItem.isHidden + && !(appletItem.isAutoFillApplet && !communicator.indexerIsSupported) //! simple Plasma AutoFill applets && !communicator.indexerIsSupported && level.indicator.host.isEnabled && (appletItem.communicator.requires.activeIndicatorEnabled