kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-13 09:59:23 +03:00
Code Issues Projects Releases Wiki Activity

disable all spacers for all separators

Browse Source 
--this makes the spacers to overlap with
each other
This commit is contained in:
Michail Vourlakos 2017-05-25 15:37:08 +03:00
parent d59a43a7aa
commit 155e037d0f
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
containment/package/contents/ui/applet/AppletItem.qml
View File

@ -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

18
plasmoid/package/contents/ui/task/TaskDelegate.qml
View File

@ -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