provide AppletItem.canFillScreenEdge

work/spdx
Michail Vourlakos 4 years ago
parent c3e8c5c8af
commit 35e9880ce7

@ -55,6 +55,7 @@ Item {
property bool canShowAppletNumberBadge: !indexerIsSupported && !isSeparator && !isHidden property bool canShowAppletNumberBadge: !indexerIsSupported && !isSeparator && !isHidden
&& !isSpacer && !isInternalViewSplitter && !isSpacer && !isInternalViewSplitter
readonly property bool canFillScreenEdge: communicator.requires.screenEdgeMarginSupported || communicator.indexerIsSupported
readonly property bool canFillThickness: applet && applet.hasOwnProperty("constraintHints") && (applet.constraintHints & PlasmaCore.Types.CanFillArea); readonly property bool canFillThickness: applet && applet.hasOwnProperty("constraintHints") && (applet.constraintHints & PlasmaCore.Types.CanFillArea);
readonly property bool isMarginsAreaSeparator: applet && applet.hasOwnProperty("constraintHints") && (applet.constraintHints & PlasmaCore.Types.MarginAreasSeparator); readonly property bool isMarginsAreaSeparator: applet && applet.hasOwnProperty("constraintHints") && (applet.constraintHints & PlasmaCore.Types.MarginAreasSeparator);

@ -459,10 +459,12 @@ Item{
property int _length:0 // through Binding to avoid binding loops property int _length:0 // through Binding to avoid binding loops
property int _thickness:0 // through Binding to avoid binding loops property int _thickness:0 // through Binding to avoid binding loops
readonly property int appliedEdgeMargin: appletItem.screenEdgeMarginSupported ? 0 : appletItem.metrics.margin.screenEdge readonly property int appliedEdgeMargin: appletItem.canFillScreenEdge ? 0 : appletItem.metrics.margin.screenEdge
readonly property int tailThicknessMargin: { readonly property int tailThicknessMargin: {
if (appletItem.screenEdgeMarginSupported) { if (appletItem.canFillScreenEdge) {
return 0; return 0;
} else if (appletItem.canFillThickness) {
return appliedEdgeMargin;
} else if (appletItem.inMarginsArea) { } else if (appletItem.inMarginsArea) {
return appliedEdgeMargin + (wrapper.zoomScaleThickness * appletItem.metrics.marginsArea.marginThickness); return appliedEdgeMargin + (wrapper.zoomScaleThickness * appletItem.metrics.marginsArea.marginThickness);
} }
@ -471,7 +473,7 @@ Item{
} }
readonly property int headThicknessMargin: { readonly property int headThicknessMargin: {
if (appletItem.canFillThickness || appletItem.screenEdgeMarginSupported) { if (appletItem.canFillThickness || appletItem.canFillScreenEdge) {
return 0; return 0;
} else if (appletItem.inMarginsArea) { } else if (appletItem.inMarginsArea) {
return appletItem.metrics.marginsArea.marginThickness; return appletItem.metrics.marginsArea.marginThickness;
@ -489,8 +491,9 @@ Item{
return wrapper.layoutThickness; return wrapper.layoutThickness;
} }
var wrapperContainerThickness = appletItem.screenEdgeMarginSupported ? appletItem.metrics.totals.thickness : wrapper.zoomScaleThickness * proposedItemSize; var canfillthickness = (appletItem.canFillScreenEdge || appletItem.canFillThickness);
return appletItem.screenEdgeMarginSupported ? wrapperContainerThickness + appletItem.metrics.margin.screenEdge : wrapperContainerThickness; var wrapperContainerThickness = canfillthickness ? appletItem.metrics.totals.thickness : wrapper.zoomScaleThickness * proposedItemSize;
return appletItem.canFillScreenEdge ? wrapperContainerThickness + appletItem.metrics.margin.screenEdge : wrapperContainerThickness;
} }
} }

@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore
Item { Item {
readonly property int thickness: { readonly property int thickness: {
if (appletItem.canFillThickness || appletItem.screenEdgeMarginSupported) { if (appletItem.canFillThickness || appletItem.canFillScreenEdge) {
return 1; return 1;
} else if (appletItem.inMarginsArea) { } else if (appletItem.inMarginsArea) {
return appletItem.metrics.marginsArea.marginThickness; return appletItem.metrics.marginsArea.marginThickness;

Loading…
Cancel
Save