diff --git a/containment/package/contents/ui/ParabolicManager.qml b/containment/package/contents/ui/ParabolicManager.qml index 53d36062f..e935186b8 100644 --- a/containment/package/contents/ui/ParabolicManager.qml +++ b/containment/package/contents/ui/ParabolicManager.qml @@ -34,6 +34,7 @@ Item { property var hidden: [] property var separators: [] + //!this is used in order to update the index when the signal is for the internal latte plasmoid //!this is used in order to update the index when the signal is for the internal latte plasmoid function updateIdSendScale(appIndex, index, zScale, zStep){ // console.log(appIndex + " _ "+index+ " _ "+zScale + " _ "+ zStep); @@ -45,23 +46,23 @@ Item { var taskIndex = -1; var internSepStep = 0; if(appIndexroot.latteAppletPos){ - if (root.latteApplet.internalSeparatorPos === root.tasksCount-1) - internSepStep = 1; + if (root.latteApplet.parabolicManager.taskIsSeparator(root.tasksCount-1)) + internSepStep = Math.abs(root.tasksCount-1 - root.latteApplet.parabolicManager.availableLowerIndex(root.tasksCount-1)); taskIndex = root.tasksCount-1 - (signalStep-appStep) - internSepStep; - if (taskIndex === root.latteApplet.internalSeparatorPos) - taskIndex = taskIndex - 1; + if (root.latteApplet.parabolicManager.taskIsSeparator(taskIndex)) + taskIndex = root.latteApplet.parabolicManager.availableLowerIndex(taskIndex - 1); - // console.log("reverse:" + taskIndex + " step:"+internSepStep + " zoom:"+zScale); + console.log("reverse:" + taskIndex + " step:"+internSepStep + " zoom:"+zScale); } root.latteApplet.updateScale(taskIndex, zScale,zStep); @@ -125,11 +126,11 @@ Item { if(!root.latteApplet || !latteNeighbour || !root.hasInternalSeparator || (root.latteApplet && root.hasInternalSeparator - && ((root.latteApplet.internalSeparatorPos>0 && root.latteApplet.internalSeparatorPosroot.latteAppletPos) - || (root.latteApplet.internalSeparatorPos===root.tasksCount-1 && indexroot.latteAppletPos) + || (root.latteApplet.parabolicManager.taskIsSeparator(root.tasksCount-1) && index -1) + /* if (gTaskIndex > -1) latteApplet.parabolicManager.clearTasksGreaterThan(gTaskIndex); if (lTaskIndex > -1) - latteApplet.parabolicManager.clearTasksLowerThan(lTaskIndex); + latteApplet.parabolicManager.clearTasksLowerThan(lTaskIndex);*/ } } diff --git a/containment/package/contents/ui/applet/AppletHiddenSpacer.qml b/containment/package/contents/ui/applet/AppletHiddenSpacer.qml index 7584befc7..2b83dcfc4 100644 --- a/containment/package/contents/ui/applet/AppletHiddenSpacer.qml +++ b/containment/package/contents/ui/applet/AppletHiddenSpacer.qml @@ -60,18 +60,14 @@ Item{ } } - Loader{ + Rectangle{ width: !root.isVertical ? parent.width : 1 height: !root.isVertical ? 1 : parent.height x: root.isVertical ? parent.width /2 : 0 y: !root.isVertical ? parent.height /2 : 0 - active: root.debugMode - - sourceComponent: Rectangle{ - border.width: 1 - border.color: "red" - color: "transparent" - } + border.width: 1 + border.color: "red" + color: "transparent" } }