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

improve clearing parabolic effect calculations

Browse Source 
--adding the internal separator made the things a little
more complicated. This commit improves the clearing
calculations in order to not conflict the messages
with each other and trying to restore all applets
and tasks that are not considered for the parabolic
effect.
This commit is contained in:
Michail Vourlakos 2017-05-03 19:13:34 +03:00
parent e39e796b28
commit 987cfba048
2 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,13 +164,12 @@ Item {
//property int debCounter: 0;
function interceptLatteAppletUpdateScale(dIndex, newScale, step){
if(!root.editMode){
if(dIndex === -1){
layoutsContainer.updateScale(index-1,newScale, step);
if(dIndex <= -1){
layoutsContainer.updateScale(index+dIndex,newScale, step);
}
else if(dIndex === root.tasksCount){
// debCounter++;
// console.log(debCounter+ " "+dIndex+" "+newScale+" received...");
layoutsContainer.updateScale(index+1,newScale, step);
else if(dIndex >= root.tasksCount){
var dif = dIndex - root.tasksCount + 1;
layoutsContainer.updateScale(index+dif,newScale, step);
}
}
}

49
plasmoid/contents/ui/TaskDelegate.qml
View File

@ -515,8 +515,16 @@ MouseArea{
root.updateScale(index-1, leftScale, 0);
if(!root.hasInternalSeparator) {
root.updateScale(index+2, 1, 0);
root.updateScale(index-2, 1, 0);
//restore neighbour tasks
var hIndex = index + 2;
var lIndex = index - 2;
if (hIndex<=icList.tasksCount)
root.updateScale(hIndex, 1, 0);
if (lIndex>=-1)
root.updateScale(lIndex, 1, 0);
} else if(root.internalSeparatorPos>=0) {
if(root.internalSeparatorPos === index+1){
if (!positiveDirection) {
@ -525,8 +533,16 @@ MouseArea{
root.updateScale(index+2, bsNeighbourZoom, 0);
}
root.updateScale(index+3, 1, 0);
root.updateScale(index-2, 1, 0);
//restore neighbour tasks
var hIndex = index + 3;
var lIndex = index - 2;
if (hIndex<=icList.tasksCount)
root.updateScale(hIndex, 1, 0);
if (lIndex>=-1)
root.updateScale(lIndex, 1, 0);
} else if(root.internalSeparatorPos === index-1) {
if (!positiveDirection) {
root.updateScale(index-2, bsNeighbourZoom, 0);
@ -534,11 +550,32 @@ MouseArea{
root.updateScale(index-2, ssNeighbourZoom, 0);
}
root.updateScale(index+2, 1, 0);
root.updateScale(index-3, 1, 0);
//restore neighbour tasks
var hIndex = index + 2;
var lIndex = index - 3;
if (hIndex<=icList.tasksCount)
root.updateScale(hIndex, 1, 0);
if (lIndex>=-1)
root.updateScale(lIndex, 1, 0);
}
}
//extra restoring signals for applets around the plasmoid
//at the low end
if (index>=2 || ((index>=1) && (!root.hasInternalSeparator || root.internalSeparatorPos>1)) ) {
root.updateScale(-1, 1, 0);
}
//at the high end
if (index<=root.tasksCount-3
|| ((index<=root.tasksCount-2)
&& (!root.hasInternalSeparator
|| (root.hasInternalSeparator && root.internalSeparatorPos<root.tasksCount-2)) )) {
root.updateScale(root.tasksCount, 1, 0);
}
//Left hiddenSpacer
if(((index === 0 )&&(icList.count > 1)) && !root.disableLeftSpacer){
hiddenSpacerLeft.nScale = leftScale - 1;