From 155e037d0ffb35235433695321d728772473ff87 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 25 May 2017 15:37:08 +0300 Subject: [PATCH] disable all spacers for all separators --this makes the spacers to overlap with each other --- .../package/contents/ui/applet/AppletItem.qml | 8 ++++---- .../package/contents/ui/task/TaskDelegate.qml | 18 +++++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml index e8fa97fcb..e533fee71 100644 --- a/containment/package/contents/ui/applet/AppletItem.qml +++ b/containment/package/contents/ui/applet/AppletItem.qml @@ -410,9 +410,9 @@ Item { property bool neighbourSeparator: false; //in case there is a neighbour internal separator - property int separatorSpace: (root.latteApplet && root.latteApplet.hasInternalSeparator + property int separatorSpace: ((root.latteApplet && root.latteApplet.hasInternalSeparator && (root.latteApplet.internalSeparatorPos === root.tasksCount-1) && index===root.latteAppletPos+1) - || (neighbourSeparator && !container.isSeparator && !container.latteApplet) ? (2+root.iconMargin/2) : 0 + || neighbourSeparator) && !container.isSeparator && !container.latteApplet ? (2+root.iconMargin/2) : 0 property real nHiddenSize: (nScale > 0) ? (container.spacersMaxSize * nScale) + separatorSpace : separatorSpace property real nScale: 0 @@ -465,9 +465,9 @@ Item { property bool neighbourSeparator: false; //in case there is a neighbour internal separator - property int separatorSpace: (root.latteApplet && root.latteApplet.hasInternalSeparator + property int separatorSpace: ((root.latteApplet && root.latteApplet.hasInternalSeparator && root.latteApplet.internalSeparatorPos === 0 && index===root.latteAppletPos-1) - || (neighbourSeparator && !container.isSeparator && !container.latteApplet) ? (2+root.iconMargin/2) : 0 + || neighbourSeparator) && !container.isSeparator && !container.latteApplet ? (2+root.iconMargin/2) : 0 property real nHiddenSize: (nScale > 0) ? (container.spacersMaxSize * nScale) + separatorSpace : separatorSpace property real nScale: 0 diff --git a/plasmoid/package/contents/ui/task/TaskDelegate.qml b/plasmoid/package/contents/ui/task/TaskDelegate.qml index e2a02d07b..c86f7ffc9 100644 --- a/plasmoid/package/contents/ui/task/TaskDelegate.qml +++ b/plasmoid/package/contents/ui/task/TaskDelegate.qml @@ -286,9 +286,9 @@ MouseArea{ property bool neighbourSeparator: false //in case there is a neighbour separator - property int separatorSpace: (parabolicManager.internalSeparatorPos !== -1 - && parabolicManager.internalSeparatorPos === index-1) - || (neighbourSeparator && !isSeparator) ? (2+root.iconMargin/2) : 0 + property int separatorSpace: ((parabolicManager.internalSeparatorPos !== -1 && parabolicManager.internalSeparatorPos === index-1) + || neighbourSeparator) && !isSeparator ? + (2+root.iconMargin/2) : 0 property real nHiddenSize: (nScale > 0) ? (mainItemContainer.spacersMaxSize * nScale) + separatorSpace : separatorSpace property real nScale: 0 @@ -308,6 +308,8 @@ MouseArea{ onItemIndexChanged: hiddenSpacerLeft.updateNeighbour(); } + Component.onCompleted: hiddenSpacerLeft.updateNeighbour(); + Behavior on nScale { enabled: !root.globalDirectRender NumberAnimation { duration: 3 * mainItemContainer.animationTime } @@ -342,9 +344,9 @@ MouseArea{ property bool neighbourSeparator: false //in case there is a neighbour separator - property int separatorSpace: (parabolicManager.internalSeparatorPos !== -1 - && parabolicManager.internalSeparatorPos === index+1) - || (neighbourSeparator && !isSeparator) ? (2+root.iconMargin/2) : 0 + property int separatorSpace: ((parabolicManager.internalSeparatorPos !== -1 && parabolicManager.internalSeparatorPos === index+1) + || neighbourSeparator) && !isSeparator ? + (2+root.iconMargin/2) : 0 property real nHiddenSize: (nScale > 0) ? (mainItemContainer.spacersMaxSize * nScale) + separatorSpace : separatorSpace property real nScale: 0 @@ -365,6 +367,8 @@ MouseArea{ onItemIndexChanged: hiddenSpacerRight.updateNeighbour(); } + Component.onCompleted: hiddenSpacerRight.updateNeighbour(); + Behavior on nScale { enabled: !root.globalDirectRender NumberAnimation { duration: 3 * mainItemContainer.animationTime } @@ -375,7 +379,7 @@ MouseArea{ NumberAnimation { duration: root.directRenderAnimationTime } } - /*Rectangle{ + /* Rectangle{ width: !root.vertical ? parent.width : 1 height: !root.vertical ? 1 : parent.height x: root.vertical ? parent.width /2 : 0