use more the ParabolicManagers

-- add even better clearZooms based on
signaling from ParabolicManagers
pull/1/head
Michail Vourlakos 8 years ago
parent 9cdd9d839b
commit fa9b313c92

@ -35,13 +35,19 @@ Item {
var appStep = Math.abs(root.latteAppletPos-appIndex); var appStep = Math.abs(root.latteAppletPos-appIndex);
var signalStep = Math.abs(index - appIndex); var signalStep = Math.abs(index - appIndex);
var taskIndex = -1;
if(appIndex<root.latteAppletPos){ if(appIndex<root.latteAppletPos){
root.latteApplet.updateScale(signalStep-appStep, zScale,zStep); taskIndex = signalStep-appStep;
} else if (appIndex>root.latteAppletPos){ } else if (appIndex>root.latteAppletPos){
root.latteApplet.updateScale(root.tasksCount-1 - (signalStep-appStep), zScale,zStep); taskIndex = root.tasksCount-1 - (signalStep-appStep);
} }
root.latteApplet.updateScale(taskIndex, zScale,zStep);
return taskIndex;
} else { } else {
root.updateScale(index, zScale, zStep); root.updateScale(index, zScale, zStep);
return -1;
} }
} }
@ -78,6 +84,9 @@ Item {
leftScale = bigNeighbourZoom; leftScale = bigNeighbourZoom;
} }
var gTaskIndex = -1;
var lTaskIndex = -1;
if(!root.latteApplet || Math.abs(root.latteAppletPos-index)>1 || !root.hasInternalSeparator if(!root.latteApplet || Math.abs(root.latteAppletPos-index)>1 || !root.hasInternalSeparator
|| (root.hasInternalSeparator || (root.hasInternalSeparator
&& ((root.latteApplet.internalSeparatorPos>0 && root.latteApplet.internalSeparatorPos<root.tasksCount-1) && ((root.latteApplet.internalSeparatorPos>0 && root.latteApplet.internalSeparatorPos<root.tasksCount-1)
@ -87,22 +96,33 @@ Item {
updateIdSendScale(index, index-1, leftScale, 0); updateIdSendScale(index, index-1, leftScale, 0);
updateIdSendScale(index, index+1, rightScale, 0); updateIdSendScale(index, index+1, rightScale, 0);
updateIdSendScale(index, index-2, 1, 0); gTaskIndex = updateIdSendScale(index, index+2, 1 ,0);
updateIdSendScale(index, index+2, 1 ,0); lTaskIndex = updateIdSendScale(index, index-2, 1, 0);
} else{ } else{
if(root.latteApplet.internalSeparatorPos === 0){ if(root.latteApplet.internalSeparatorPos === 0){
updateIdSendScale(index, index+2, rightScale, 0); updateIdSendScale(index, index+2, rightScale, 0);
updateIdSendScale(index, index-1, leftScale, 0); updateIdSendScale(index, index-1, leftScale, 0);
updateIdSendScale(index, index+3, 1, 0); gTaskIndex = updateIdSendScale(index, index+3, 1, 0);
updateIdSendScale(index, index-2, 1, 0); lTaskIndex = updateIdSendScale(index, index-2, 1, 0);
} else if(root.hasInternalSeparator && root.latteApplet.internalSeparatorPos === root.tasksCount-1) { } else if(root.hasInternalSeparator && root.latteApplet.internalSeparatorPos === root.tasksCount-1) {
updateIdSendScale(index, index-2, leftScale, 0); updateIdSendScale(index, index-2, leftScale, 0);
updateIdSendScale(index, index+1, rightScale, 0); updateIdSendScale(index, index+1, rightScale, 0);
updateIdSendScale(index, index+2, 1, 0); gTaskIndex = updateIdSendScale(index, index+2, 1, 0);
updateIdSendScale(index, index-3, 1, 0); lTaskIndex = updateIdSendScale(index, index-3, 1, 0);
}
}
if (latteApplet) {
if (gTaskIndex === -1 && lTaskIndex === -1){
latteApplet.parabolicManager.clearTasksGreaterThan(0);
} else {
if (gTaskIndex > -1)
latteApplet.parabolicManager.clearTasksGreaterThan(gTaskIndex-1);
if (lTaskIndex > -1)
latteApplet.parabolicManager.clearTasksLowerThan(lTaskIndex+1);
} }
} }

@ -102,6 +102,7 @@ Item {
property QtObject contextMenu: null property QtObject contextMenu: null
property QtObject contextMenuComponent: Qt.createComponent("ContextMenu.qml"); property QtObject contextMenuComponent: Qt.createComponent("ContextMenu.qml");
property Item dragSource: null property Item dragSource: null
property Item parabolicManager: _parabolicManager
property color minimizedDotColor: textColorLuma > 0.5 ? Qt.darker(theme.textColor, 1+ (1-textColorLuma)) : Qt.lighter(theme.textColor, 1+(1-textColorLuma)) property color minimizedDotColor: textColorLuma > 0.5 ? Qt.darker(theme.textColor, 1+ (1-textColorLuma)) : Qt.lighter(theme.textColor, 1+(1-textColorLuma))
@ -653,7 +654,7 @@ Item {
} }
ParabolicManager{ ParabolicManager{
id: parabolicManager id: _parabolicManager
} }
/* IconsModel{ /* IconsModel{

Loading…
Cancel
Save