From 506d23d948fd9d15705319e82be7df4c7ca963ee Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 14 Apr 2018 18:34:02 +0300 Subject: [PATCH] enable parab.effect for latte spacer --- containment/package/contents/ui/ConfigOverlay.qml | 1 - containment/package/contents/ui/applet/AppletItem.qml | 4 ++-- .../package/contents/ui/applet/AppletItemWrapper.qml | 9 +++++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/containment/package/contents/ui/ConfigOverlay.qml b/containment/package/contents/ui/ConfigOverlay.qml index 91f0c2e59..f7c7ade03 100644 --- a/containment/package/contents/ui/ConfigOverlay.qml +++ b/containment/package/contents/ui/ConfigOverlay.qml @@ -409,7 +409,6 @@ MouseArea { closeButton.visible = !currentApplet.isInternalViewSplitter && currentApplet.applet.action("remove") && currentApplet.applet.action("remove").enabled && !(currentApplet.applet.pluginName===root.plasmoidName && dock && dock.docksWithTasks()===1 && dock.tasksPresent()); lockButton.visible = !currentApplet.isInternalViewSplitter && (currentApplet.applet.pluginName !== "org.kde.plasma.systemtray") - && (currentApplet.applet.pluginName !== "org.kde.latte.spacer") && (currentApplet.applet.pluginName !== root.plasmoidName) && !currentApplet.isSeparator diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index 40e058441..2931f4409 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -241,7 +241,7 @@ Item { function checkCanBeHovered(){ if ( (((applet && (applet.Layout.minimumWidth > root.iconSize) && root.isHorizontal) || (applet && (applet.Layout.minimumHeight > root.iconSize) && root.isVertical)) - && (applet && applet.pluginName !== "org.kde.plasma.panelspacer") + && (applet && applet.pluginName !== "org.kde.plasma.panelspacer" && (applet.pluginName !== "org.kde.latte.spacer")) && !container.fakeIconItem) || (isSystray) || (container.needsFillSpace) ) { @@ -350,7 +350,7 @@ Item { onLatteSpacerChanged: { if(container.latteSpacer){ latteSpacer.latteDock = root; - container.lockZoom = true; + //container.lockZoom = true; } } diff --git a/containment/package/contents/ui/applet/AppletItemWrapper.qml b/containment/package/contents/ui/applet/AppletItemWrapper.qml index 4d585a86f..4263c141c 100644 --- a/containment/package/contents/ui/applet/AppletItemWrapper.qml +++ b/containment/package/contents/ui/applet/AppletItemWrapper.qml @@ -267,7 +267,9 @@ Item{ && !disableScaleWidth && !container.fakeIconItem) { //&& !root.editMode ){ - disableScaleHeight = true; + if (!container.isSpacer) { + disableScaleHeight = true; + } //this way improves performance, probably because during animation the preferred sizes update a lot if((applet.Layout.maximumHeight < root.iconSize)){ layoutHeight = applet.Layout.maximumHeight; @@ -313,7 +315,10 @@ Item{ && !disableScaleHeight && !container.fakeIconItem){ // && !root.editMode){ - disableScaleWidth = true; + + if (!container.isSpacer) { + disableScaleWidth = true; + } //this way improves performance, probably because during animation the preferred sizes update a lot if((applet.Layout.maximumWidth < root.iconSize)){ // return applet.Layout.maximumWidth;