kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-04 01:47:31 +03:00
Code Issues Projects Releases Wiki Activity

apply a proper clearing zoom for applets

Browse Source 
--this is finally used properly through the
ParabolicManagers new architecture. Any old
problems concerning applets that didnt clearing
their zoom should be fixed totally now!!
This commit is contained in:
Michail Vourlakos 2017-05-23 20:26:20 +03:00
parent a16ed0e9ef
commit 528a857b47
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
containment/package/contents/ui/applet/AppletItemWrapper.qml
View File

@ -596,9 +596,9 @@ Item{
//use the new parabolicManager in order to handle all parabolic effect messages //use the new parabolicManager in order to handle all parabolic effect messages
var scales = parabolicManager.applyParabolicEffect(index, currentMousePosition, center); var scales = parabolicManager.applyParabolicEffect(index, currentMousePosition, center);
if (root.latteApplet && Math.abs(index - root.latteAppletPos) > 2){ /*if (root.latteApplet && Math.abs(index - root.latteAppletPos) > 2){
root.latteApplet.clearZoom(); root.latteApplet.clearZoom();
} }*/
//Left hiddenSpacer //Left hiddenSpacer
if(container.startEdge){ if(container.startEdge){

30
plasmoid/package/contents/ui/ParabolicManager.qml
View File

@ -37,6 +37,7 @@ Item {
function updateIdSendScale(index, zScale, zStep){ function updateIdSendScale(index, zScale, zStep){
if ((index>=0 && index<=root.tasksCount-1) || (!root.latteDock)){ if ((index>=0 && index<=root.tasksCount-1) || (!root.latteDock)){
root.updateScale(index, zScale, zStep); root.updateScale(index, zScale, zStep);
return -1;
} else{ } else{
var appletId = latteDock.latteAppletPos; var appletId = latteDock.latteAppletPos;
if (index<0) if (index<0)
@ -47,6 +48,7 @@ Item {
} }
latteDock.updateScale(appletId, zScale, zStep); latteDock.updateScale(appletId, zScale, zStep);
return appletId;
} }
} }
@ -85,13 +87,16 @@ Item {
// console.debug(leftScale + " " + rightScale + " " + index); // console.debug(leftScale + " " + rightScale + " " + index);
var gAppletId = -1;
var lAppletId = -1;
if(!hasInternalSeparator || Math.abs(index-internalSeparatorPos)>=2){ if(!hasInternalSeparator || Math.abs(index-internalSeparatorPos)>=2){
//activate messages to update the the neighbour scales //activate messages to update the the neighbour scales
updateIdSendScale(index+1, rightScale, 0); updateIdSendScale(index+1, rightScale, 0);
updateIdSendScale(index-1, leftScale, 0); updateIdSendScale(index-1, leftScale, 0);
updateIdSendScale(index+2, 1, 0); gAppletId = updateIdSendScale(index+2, 1, 0);
updateIdSendScale(index-2, 1, 0); lAppletId = updateIdSendScale(index-2, 1, 0);
clearTasksGreaterThan(index+1); clearTasksGreaterThan(index+1);
clearTasksLowerThan(index-1); clearTasksLowerThan(index-1);
@ -100,9 +105,8 @@ Item {
updateIdSendScale(index+2, rightScale, 0); updateIdSendScale(index+2, rightScale, 0);
updateIdSendScale(index-1, leftScale, 0); updateIdSendScale(index-1, leftScale, 0);
gAppletId = updateIdSendScale(index+3, 1, 0);
updateIdSendScale(index+3, 1, 0); lAppletId = updateIdSendScale(index-2, 1, 0);
updateIdSendScale(index-2, 1, 0);
clearTasksGreaterThan(index+2); clearTasksGreaterThan(index+2);
clearTasksLowerThan(index-1); clearTasksLowerThan(index-1);
@ -110,14 +114,26 @@ Item {
updateIdSendScale(index-2, leftScale, 0); updateIdSendScale(index-2, leftScale, 0);
updateIdSendScale(index+1, rightScale, 0); updateIdSendScale(index+1, rightScale, 0);
updateIdSendScale(index+2, 1, 0); gAppletId = updateIdSendScale(index+2, 1, 0);
updateIdSendScale(index-3, 1, 0); lAppletId = updateIdSendScale(index-3, 1, 0);
clearTasksGreaterThan(index+1); clearTasksGreaterThan(index+1);
clearTasksLowerThan(index-2); clearTasksLowerThan(index-2);
} }
} }
if (latteDock){
if (gAppletId > -1)
latteDock.parabolicManager.clearAppletsGreaterThan(gAppletId-1);
else
latteDock.parabolicManager.clearAppletsGreaterThan(latteDock.latteAppletPos);
if (lAppletId > -1)
latteDock.parabolicManager.clearAppletsLowerThan(lAppletId+1);
else
latteDock.parabolicManager.clearAppletsLowerThan(latteDock.latteAppletPos);
}
return {leftScale:leftScale, rightScale:rightScale}; return {leftScale:leftScale, rightScale:rightScale};
} }