From 79bcf40e5fe7d6f1acfb3b5686e3fb90e8340385 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 23 May 2020 00:19:04 +0300 Subject: [PATCH] remove some deprecated paraboliceffect apis --- plasmoid/package/contents/ui/task/HiddenSpacer.qml | 2 +- plasmoid/package/contents/ui/task/ProgressOverlay.qml | 2 +- plasmoid/package/contents/ui/task/TaskItem.qml | 8 -------- plasmoid/package/contents/ui/task/Wrapper.qml | 4 ++-- .../contents/ui/task/animations/RealRemovalAnimation.qml | 3 --- .../package/contents/ui/taskslayout/ScrollableList.qml | 2 +- 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/plasmoid/package/contents/ui/task/HiddenSpacer.qml b/plasmoid/package/contents/ui/task/HiddenSpacer.qml index a06e7f585..09a9aec1c 100644 --- a/plasmoid/package/contents/ui/task/HiddenSpacer.qml +++ b/plasmoid/package/contents/ui/task/HiddenSpacer.qml @@ -28,7 +28,7 @@ Item{ width: root.vertical ? wrapper.width : nHiddenSize height: root.vertical ? nHiddenSize : wrapper.height - visible: (rightSpacer ? index === parabolicManager.lastRealTaskIndex : index === parabolicManager.firstRealTaskIndex) + visible: (rightSpacer ? index === taskItem.indexer.lastVisibleItemIndex : index === taskItem.indexer.firstVisibleItemIndex) || (separatorSpace > 0) || taskItem.inAttentionAnimation || taskItem.inFastRestoreAnimation || taskItem.inMimicParabolicAnimation diff --git a/plasmoid/package/contents/ui/task/ProgressOverlay.qml b/plasmoid/package/contents/ui/task/ProgressOverlay.qml index ee2348c02..47aa10534 100644 --- a/plasmoid/package/contents/ui/task/ProgressOverlay.qml +++ b/plasmoid/package/contents/ui/task/ProgressOverlay.qml @@ -62,7 +62,7 @@ Item { maximumWidth: { if (showsAudioBadge) { return height; - } else if ( index === parabolicManager.firstRealTaskIndex && !taskItem.containsMouse) { + } else if ( index === taskItem.indexer.firstVisibleItemIndex && !taskItem.containsMouse) { return (wrapper.mScale * (taskItem.metrics.iconSize - (root.enableShadows ? shadowSize/2 : 0))); } else { return 999999; diff --git a/plasmoid/package/contents/ui/task/TaskItem.qml b/plasmoid/package/contents/ui/task/TaskItem.qml index 55e7ce747..0690e8e0c 100644 --- a/plasmoid/package/contents/ui/task/TaskItem.qml +++ b/plasmoid/package/contents/ui/task/TaskItem.qml @@ -584,14 +584,6 @@ MouseArea{ } } - onLastValidIndexChanged: { - if (lastValidIndex>=0 && lastValidIndex parabolicManager.lastRealTaskIndex)) { - parabolicManager.updateTasksEdgesIndexes(); - } - } - } - onIsDraggedChanged: { if(isDragged && (!root.inConfigureAppletsMode)){ root.dragSource = taskItem; diff --git a/plasmoid/package/contents/ui/task/Wrapper.qml b/plasmoid/package/contents/ui/task/Wrapper.qml index abcc2e1b2..1b4f95e56 100644 --- a/plasmoid/package/contents/ui/task/Wrapper.qml +++ b/plasmoid/package/contents/ui/task/Wrapper.qml @@ -166,13 +166,13 @@ Item{ var scales = taskItem.parabolic.applyParabolicEffect(index, currentMousePosition, center); //Left hiddenSpacer for first task - if(((index === parabolicManager.firstRealTaskIndex )&&(root.tasksCount>0)) && !root.disableLeftSpacer + if(((index === taskItem.indexer.firstVisibleItemIndex)&&(root.tasksCount>0)) && !root.disableLeftSpacer && !inMimicParabolicAnimation && !inFastRestoreAnimation && !inAttentionAnimation){ hiddenSpacerLeft.nScale = scales.leftScale - 1; } //Right hiddenSpacer for last task - if(((index === parabolicManager.lastRealTaskIndex )&&(root.tasksCount>0)) && !root.disableRightSpacer + if(((index === taskItem.indexer.lastVisibleItemIndex )&&(root.tasksCount>0)) && !root.disableRightSpacer && !inMimicParabolicAnimation && !inFastRestoreAnimation && !inAttentionAnimation){ hiddenSpacerRight.nScale = scales.rightScale - 1; } diff --git a/plasmoid/package/contents/ui/task/animations/RealRemovalAnimation.qml b/plasmoid/package/contents/ui/task/animations/RealRemovalAnimation.qml index cdac8a4fa..7f4e4463f 100644 --- a/plasmoid/package/contents/ui/task/animations/RealRemovalAnimation.qml +++ b/plasmoid/package/contents/ui/task/animations/RealRemovalAnimation.qml @@ -68,9 +68,6 @@ SequentialAnimation { //! the removal animation a small margin must applied var spacer = taskItem.headItemIsSeparator ? -(2+taskItem.metrics.totals.lengthEdge) : ( taskItem.headItemIsSeparator ? (2+taskItem.metrics.totals.lengthEdge)/2 : 0); - //console.log("EDGES ::: " + parabolicManager.firstRealTaskIndex + " _ " + parabolicManager.lastRealTaskIndex); - //console.log("Removing ::: " + lastValidIndex + " _ " + launcherUrl + " _ " + previousTaskIsSeparator + " _ " + nextTaskIsSeparator); - if (root.vertical) { taskItem.anchors.top = previousTask.bottom; taskItem.anchors.topMargin = spacer; diff --git a/plasmoid/package/contents/ui/taskslayout/ScrollableList.qml b/plasmoid/package/contents/ui/taskslayout/ScrollableList.qml index af1f6060b..6f8869ebb 100644 --- a/plasmoid/package/contents/ui/taskslayout/ScrollableList.qml +++ b/plasmoid/package/contents/ui/taskslayout/ScrollableList.qml @@ -169,7 +169,7 @@ Flickable{ var block = !root.autoScrollTasksEnabled && !duringDragging; if (block || !contentsExceed || root.tasksCount < 3 - || (task.itemIndex===parabolicManager.lastRealTaskIndex && parabolic.factor.zoom>1)) { + || (task.itemIndex===task.indexer.lastVisibleItemIndex && parabolic.factor.zoom>1)) { //last task with parabolic effect breaks the autoscolling behavior return; }