From c9caa408ea377ca392274277e4044c1386f11bc0 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Mon, 18 May 2020 23:34:30 +0300 Subject: [PATCH] update Layout preferred values for Tasks --- .../package/contents/ui/applet/AppletItem.qml | 2 +- .../contents/ui/applet/ItemWrapper.qml | 20 +++++++++---------- plasmoid/package/contents/ui/main.qml | 3 +++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index e2401fb78..4d194ed6d 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -226,7 +226,7 @@ Item { } //! local margins - readonly property bool parabolicEffectMarginsEnabled: appletItem.parabolic.factor.zoom>1 && !originalAppletBehavior + 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 diff --git a/containment/package/contents/ui/applet/ItemWrapper.qml b/containment/package/contents/ui/applet/ItemWrapper.qml index 0b7298fce..1feb5d16c 100644 --- a/containment/package/contents/ui/applet/ItemWrapper.qml +++ b/containment/package/contents/ui/applet/ItemWrapper.qml @@ -49,10 +49,6 @@ Item{ appletItem.maxAutoFillLength : Math.max(appletItem.minAutoFillLength, appletPreferredLength); } - if (appletItem.latteApplet) { - return root.isHorizontal ? latteApplet.tasksWidth : latteApplet.tasksHeight; - } - return root.inConfigureAppletsMode ? Math.max(Math.min(appletItem.metrics.iconSize, root.minAppletLengthInConfigure), scaledLength) : scaledLength; } @@ -61,10 +57,6 @@ Item{ return 0; } - if (appletItem.latteApplet) { - return root.isHorizontal ? latteApplet.tasksHeight : latteApplet.tasksWidth; - } - return scaledThickness + appletItem.metrics.margin.screenEdge } @@ -221,12 +213,16 @@ Item{ Binding { target: wrapper property: "layoutThickness" - when: latteView && !isLattePlasmoid && (wrapper.zoomScale === 1) + when: latteView && (wrapper.zoomScale === 1) value: { if (appletItem.isInternalViewSplitter){ return !root.inConfigureAppletsMode ? 0 : appletItem.metrics.iconSize; } + if (communicator.parabolicEffectIsSupported) { + return appletPreferredThickness; + } + return appletItem.metrics.iconSize; } } @@ -234,7 +230,7 @@ Item{ Binding { target: wrapper property: "layoutLength" - when: latteView && !isLattePlasmoid && !appletItem.isAutoFillApplet && (wrapper.zoomScale === 1) + when: latteView && !appletItem.isAutoFillApplet && (wrapper.zoomScale === 1) value: { if (appletItem.isInternalViewSplitter){ return !root.inConfigureAppletsMode ? 0 : Math.min(appletItem.metrics.iconSize, root.maxJustifySplitterSize); @@ -265,6 +261,10 @@ Item{ value: { var blockParabolicEffectInLength = false; + if (communicator.parabolicEffectIsSupported) { + return true; + } + if (appletItem.isInternalViewSplitter){ return false; } else { diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index ee0865ee1..993279e58 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -969,6 +969,9 @@ Item { id: _requires bridge: latteBridge + activeIndicatorEnabled: false + latteIconOverlayEnabled: false + lengthMarginsEnabled: false latteSideColoringEnabled: false screenEdgeMarginSupported: true innerZoomFactor: {