fix single task case for parabolic effect

--when there was only one task in the plasmoid
the parabolic effect was breaking with neighbour
applets
pull/2/head
Michail Vourlakos 7 years ago
parent a4a5a61574
commit 63304d91d7

@ -53,7 +53,7 @@ Item {
if (root.latteApplet.parabolicManager.taskIsSeparator(taskIndex))
taskIndex = root.latteApplet.parabolicManager.availableHigherIndex(taskIndex + 1);
//console.log("normal:" + taskIndex + " step:"+internSepStep + " zoom:"+zScale);
console.log("normal:" + taskIndex + " step:"+internSepStep + " zoom:"+zScale);
} else if (appIndex>root.latteAppletPos){
if (root.latteApplet.parabolicManager.taskIsSeparator(root.tasksCount-1))
internSepStep = Math.abs(root.tasksCount-1 - root.latteApplet.parabolicManager.availableLowerIndex(root.tasksCount-1));
@ -62,7 +62,7 @@ Item {
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);
@ -118,7 +118,6 @@ Item {
var tLIndex = -1;
var tHIndex = -1;
var gAppN = availableHigherId(index+1);
var lAppN = availableLowerId(index-1);
@ -130,7 +129,7 @@ Item {
|| (root.latteApplet.parabolicManager.taskIsSeparator(0) && index>root.latteAppletPos)
|| (root.latteApplet.parabolicManager.taskIsSeparator(root.tasksCount-1) && index<root.latteAppletPos)))
){
//console.log("style 1...");
console.log("style 1...");
gAppletIndex = gAppN;
lAppletIndex = lAppN;
@ -144,7 +143,7 @@ Item {
lTaskIndex = updateIdSendScale(index, tLIndex, 1, 0);
} else{
if(gAppN === root.latteAppletPos && root.latteApplet.parabolicManager.taskIsSeparator(0)){
//console.log("style 2...");
console.log("style 2...");
gAppletIndex = availableHigherId(index+1);
lAppletIndex= availableLowerId(index-1);
updateIdSendScale(index, gAppletIndex, rightScale, 0);
@ -154,7 +153,7 @@ Item {
gTaskIndex = updateIdSendScale(index, gAppletIndex+1, 1, 0);
lTaskIndex = updateIdSendScale(index, tLIndex, 1, 0);
} else if(lAppN === root.latteAppletPos && root.latteApplet.parabolicManager.taskIsSeparator(root.tasksCount-1)) {
//console.log("style 3...");
console.log("style 3...");
gAppletIndex = gAppN;
lAppletIndex= lAppN;
updateIdSendScale(index, lAppletIndex, leftScale, 0);
@ -166,7 +165,8 @@ Item {
}
}
if (latteApplet) {
//!when there isnt a single task
if (latteApplet && (root.latteApplet.parabolicManager.firstRealTaskIndex !== root.latteApplet.parabolicManager.lastRealTaskIndex)) {
if (gTaskIndex === -1 && lTaskIndex === -1){
latteApplet.parabolicManager.clearTasksGreaterThan(0);
} else {
@ -296,7 +296,8 @@ Item {
function availableLowerId(from) {
var next = from;
while (separators.indexOf(next) !== -1 || hidden.indexOf(next) !== -1)
while (separators.indexOf(next) !== -1
|| hidden.indexOf(next) !== -1)
next = next - 1;
return next;
@ -305,7 +306,8 @@ Item {
function availableHigherId(from) {
var next = from;
while (separators.indexOf(next) !== -1 || hidden.indexOf(next) !== -1)
while (separators.indexOf(next) !== -1
|| hidden.indexOf(next) !== -1)
next = next + 1;
return next;

@ -120,60 +120,37 @@ Item {
var gStep = 1;
var lStep = 1;
if(!hasInternalSeparator || !(taskIsSeparator(index) || taskIsSeparator(index-1) || taskIsSeparator(index+1))){
//console.log("--- task style 1...");
gPAppletId = updateIdSendScale(index+1, rightScale, 0);
lPAppletId = updateIdSendScale(index-1, leftScale, 0);
//console.log("index:"+index + " lattePos:"+latteDock.latteAppletPos);
//console.log("gApp:"+gPAppletId+" lApp:"+lPAppletId);
if (latteDock) {
if (gPAppletId > -1)
gStep = Math.abs(gPAppletId - latteDock.latteAppletPos);
else if (lPAppletId > -1)
lStep = Math.abs(lPAppletId - latteDock.latteAppletPos);
}
//console.log("gs:"+gStep+" ls:"+lStep);
gAppletId = updateIdSendScale(index+gStep+1, 1, 0);
lAppletId = updateIdSendScale(index-lStep-1, 1, 0);
//console.log("--- task style 2...");
var aGId1 = availableHigherIndex(index+1);
var aLId1 = availableLowerIndex(index-1);
//console.log(" cgApp:"+gAppletId+" clApp:"+lAppletId);
gPAppletId = updateIdSendScale(aGId1, rightScale, 0);
lPAppletId = updateIdSendScale(aLId1, leftScale, 0);
clearTasksGreaterThan(index+1);
clearTasksLowerThan(index-1);
} else if(hasInternalSeparator) {
//console.log("--- task style 2...");
var aGId1 = availableHigherIndex(index+1);
var aLId1 = availableLowerIndex(index-1);
// console.log("index:"+index + " lattePos:"+latteDock.latteAppletPos);
// console.log("gApp:"+gPAppletId+" lApp:"+lPAppletId+ " aG1:"+aGId1+" aLId1:"+aLId1);
gPAppletId = updateIdSendScale(aGId1, rightScale, 0);
lPAppletId = updateIdSendScale(aLId1, leftScale, 0);
gStep = aGId1 - index;
lStep = index - aLId1;
// console.log("index:"+index + " lattePos:"+latteDock.latteAppletPos);
// console.log("gApp:"+gPAppletId+" lApp:"+lPAppletId+ " aG1:"+aGId1+" aLId1:"+aLId1);
if (latteDock) {
if (gPAppletId > -1)
gStep = Math.abs(gPAppletId - latteDock.latteAppletPos + (root.tasksCount-1-index));
gStep = aGId1 - index;
lStep = index - aLId1;
if (lPAppletId > -1)
lStep = Math.abs(lPAppletId - latteDock.latteAppletPos - index);
}
if (latteDock) {
if (gPAppletId > -1)
gStep = Math.abs(gPAppletId - latteDock.latteAppletPos + (root.tasksCount-1-index));
else if (lPAppletId > -1)
lStep = Math.abs(lPAppletId - latteDock.latteAppletPos - index);
}
//console.log("gs:"+gStep+" ls:"+lStep);
//console.log("gs:"+gStep+" ls:"+lStep);
gAppletId = updateIdSendScale(index+gStep+1, 1, 0);
lAppletId = updateIdSendScale(index-lStep-1, 1, 0);
gAppletId = updateIdSendScale(index+gStep+1, 1, 0);
lAppletId = updateIdSendScale(index-lStep-1, 1, 0);
//console.log(" cgApp:"+gAppletId+" clApp:"+lAppletId);
//console.log(" cgApp:"+gAppletId+" clApp:"+lAppletId);
clearTasksGreaterThan(aGId1+1);
clearTasksLowerThan(aLId1-1);
}
clearTasksGreaterThan(aGId1+1);
clearTasksLowerThan(aLId1-1);
if (latteDock){
if (gAppletId > -1)
@ -217,7 +194,7 @@ Item {
&& (hovered === index
|| hovered === availableLowerIndex(index-1)
|| hovered === availableHigherIndex(index+1) )) {
return true;
return true;
}
return false;

Loading…
Cancel
Save