kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-21 10:50:30 +03:00
Code Issues Projects Releases Wiki Activity

support correct calculations from applets/separ.

Browse Source 
--the applets now take into account the tasks
internal separator in order to provide beautiful
smooth parabolic animation when the internal separator
is at some of the Tasks edges
This commit is contained in:
Michail Vourlakos 2017-04-28 21:35:33 +03:00
parent 2a006177e7
commit ec68562174
1 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
containment/contents/ui/AppletItem.qml
View File

@ -896,6 +896,36 @@ Item {
leftScale = bigNeighbourZoom;
}
//! compute the neighbour separator scales for latteApplet
var bsNeighbourZoom = 1;
var ssNeighbourZoom = 1;
if(root.latteApplet && root.latteApplet.internalSeparatorPos>=0) {
var latApp = root.latteApplet;
if((latApp.internalSeparatorPos === latApp.tasksCount - 1) || (latApp.internalSeparatorPos === 0) &&
(index === root.latteAppletPos-1 || index === root.latteAppletPos+1 )){
var maxTaskLength = latApp.maxSeparatorLength+latApp.missingSeparatorLength;
var sepZoomDifference = (latApp.maxSeparatorLength / maxTaskLength) * root.zoomFactor;
bsNeighbourZoom = Math.max(1,bigNeighbourZoom - sepZoomDifference);
ssNeighbourZoom = Math.max(1,smallNeighbourZoom - sepZoomDifference);
if(latApp.internalSeparatorPos === 0 && (index === root.latteAppletPos-1) ){
if (!positiveDirection) {
latApp.updateScale(1, ssNeighbourZoom, 0);
} else {
latApp.updateScale(1, bsNeighbourZoom, 0);
}
} else if((latApp.internalSeparatorPos === latApp.tasksCount - 1) &&(index === root.latteAppletPos+1)) {
if (!positiveDirection) {
latApp.updateScale(latApp.tasksCount-2, bsNeighbourZoom, 0);
} else {
latApp.updateScale(latApp.tasksCount-2, ssNeighbourZoom, 0);
}
}
}
}
// console.log("--------------")
// console.debug(leftScale + " " + rightScale + " " + index);
@ -944,21 +974,17 @@ Item {
}
else{
if(layoutsContainer.hoveredIndex<container.index){
if (root.latteInternalSeparatorPos===0){
latteApplet.updateScale(1, nScale, step);
latteApplet.updateScale(2,1,0);
} else {
latteApplet.updateScale(0, nScale, step);
latteApplet.updateScale(0, nScale, step);
if (root.latteInternalSeparatorPos!==0)
latteApplet.updateScale(1, 1, 0);
}
else
latteApplet.updateScale(2, 1, 0);
} else if(layoutsContainer.hoveredIndex>container.index) {
if (root.latteInternalSeparatorPos===root.tasksCount-1){
latteApplet.updateScale(root.tasksCount-2, nScale, step);
latteApplet.updateScale(root.tasksCount-3, 1, 0);
} else {
latteApplet.updateScale(root.tasksCount-1, nScale, step);
latteApplet.updateScale(root.tasksCount-1, nScale, step);
if (root.latteInternalSeparatorPos!==root.tasksCount-1)
latteApplet.updateScale(root.tasksCount-2, 1, 0);
}
else
latteApplet.updateScale(root.tasksCount-3, 1, 0);
}
}
} ///if the applet is hidden must forward its scale events to its neighbours