diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index bae36cc6b..eb28066c6 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -213,7 +213,6 @@ Item { signal showPreviewForTasks(QtObject group); //trigger updating scaling of neighbour delegates of zoomed delegate signal updateScale(int delegateIndex, real newScale, real step) - signal mimicEnterForParabolic(); signal publishTasksGeometries(); signal windowsHovered(variant winIds, bool hovered) diff --git a/plasmoid/package/contents/ui/task/ParabolicEventsArea.qml b/plasmoid/package/contents/ui/task/ParabolicEventsArea.qml index a3d0fd716..43425b1f9 100644 --- a/plasmoid/package/contents/ui/task/ParabolicEventsArea.qml +++ b/plasmoid/package/contents/ui/task/ParabolicEventsArea.qml @@ -163,15 +163,6 @@ Item { function updateScale(nIndex, nScale, step){ if (!_parabolicArea.containsMouse && (index === nIndex) && !isParabolicEventBlocked){ - /*if (taskItem.inAttentionAnimation) { - var subSpacerScale = (nScale-1)/2; - - hiddenSpacerLeft.nScale = subSpacerScale; - hiddenSpacerRight.nScale = subSpacerScale; - } else if (!inBlockingAnimation || taskItem.inMimicParabolicAnimation) { - - }*/ - if (parabolicItem.isUpdatingOnlySpacers) { var subSpacerScale = (nScale-1)/2; @@ -186,10 +177,6 @@ Item { newScale = abilityItem.parabolicItem.zoom + step; } - /*if (inMimicParabolicAnimation && mimicParabolicScale === -1) { - mimicParabolicScale = newScale; - }*/ - abilityItem.parabolicItem.zoom = newScale; } } diff --git a/plasmoid/package/contents/ui/task/ParabolicItem.qml b/plasmoid/package/contents/ui/task/ParabolicItem.qml index 27e881c31..3bfbd1d9a 100644 --- a/plasmoid/package/contents/ui/task/ParabolicItem.qml +++ b/plasmoid/package/contents/ui/task/ParabolicItem.qml @@ -113,7 +113,7 @@ Item{ Behavior on zoom { id: animatedBehavior - enabled: !taskItem.abilities.parabolic.directRenderingEnabled || inMimicParabolicAnimation || restoreAnimation.running + enabled: !taskItem.abilities.parabolic.directRenderingEnabled || restoreAnimation.running NumberAnimation{ duration: 3 * taskItem.animationTime easing.type: Easing.OutCubic @@ -224,20 +224,6 @@ Item{ taskItem.abilities.parabolic.setDirectRenderingEnabled(true); } - if (inMimicParabolicAnimation){ - if (zoom >= mimicParabolicScale) { - inMimicParabolicAnimation = false; - inAnimation = false; - inBlockingAnimation = false; - mimicParabolicScale = -1; - } else { - var tempScale = (taskItem.abilities.parabolic.factor.zoom - zoom) / 2; - - hiddenSpacerLeft.nScale = tempScale; - hiddenSpacerRight.nScale = tempScale; - } - } - if ((zoom > 1) && !isZoomed) { isZoomed = true; taskItem.abilities.animations.needBothAxis.addEvent(bothAxisZoomEvent); diff --git a/plasmoid/package/contents/ui/task/TaskIcon.qml b/plasmoid/package/contents/ui/task/TaskIcon.qml index f1d61f1ca..4a9e61936 100644 --- a/plasmoid/package/contents/ui/task/TaskIcon.qml +++ b/plasmoid/package/contents/ui/task/TaskIcon.qml @@ -129,7 +129,7 @@ Item { Transition{ from: "animating" to: "*" - enabled: !fastRestoreAnimation.running && !taskItem.inMimicParabolicAnimation + enabled: !fastRestoreAnimation.running AnchorAnimation { duration: 1.5 * taskItem.abilities.animations.speedFactor.current * taskItem.abilities.animations.duration.large } } diff --git a/plasmoid/package/contents/ui/task/TaskItem.qml b/plasmoid/package/contents/ui/task/TaskItem.qml index 28509260d..30ff33ab6 100644 --- a/plasmoid/package/contents/ui/task/TaskItem.qml +++ b/plasmoid/package/contents/ui/task/TaskItem.qml @@ -43,7 +43,6 @@ AbilityBasicItem { isHidden: !visible || isForcedHidden isHiddenSpacerVisible: taskItem.inAttentionAnimation || taskItem.inFastRestoreAnimation - || taskItem.inMimicParabolicAnimation isHiddenSpacerAnimated: taskItem.inFastRestoreAnimation || showWindowAnimation.running || restoreAnimation.running @@ -54,7 +53,7 @@ AbilityBasicItem { || !hoverEnabled || inAnimation || !hoverEnabled - || (inBlockingAnimation && !(inAttentionAnimation||inFastRestoreAnimation||inMimicParabolicAnimation)) + || (inBlockingAnimation && !(inAttentionAnimation||inFastRestoreAnimation)) isSeparatorInRealLength: isSeparator && root.dragSource @@ -85,9 +84,7 @@ AbilityBasicItem { property bool inBlockingAnimation: false property bool inBouncingAnimation: false property bool inFastRestoreAnimation: false - property bool inMimicParabolicAnimation: false property bool inNewWindowAnimation: false - property real mimicParabolicScale: -1 property bool inPopup: false property bool inRemoveStage: false @@ -623,18 +620,6 @@ AbilityBasicItem { inBlockingAnimation = value; } - function slotMimicEnterForParabolic(){ - if (containsMouse) { - if (inMimicParabolicAnimation) { - mimicParabolicScale = taskItem.abilities.parabolic.factor.zoom; - } - - if (parabolicEventsAreaLoader.active) { - parabolicEventsAreaLoader.item.calculateParabolicScales(icList.currentSpot); - } - } - } - function slotShowPreviewForTasks(group) { if (group === taskItem && !windowsPreviewDlg.visible) { preparePreviewWindow(true); @@ -920,7 +905,6 @@ AbilityBasicItem { root.draggingFinished.connect(handlerDraggingFinished); root.publishTasksGeometries.connect(slotPublishGeometries); root.showPreviewForTasks.connect(slotShowPreviewForTasks); - root.mimicEnterForParabolic.connect(slotMimicEnterForParabolic); taskItem.abilities.launchers.launcherChanged.connect(onLauncherChanged); taskItem.abilities.launchers.launcherRemoved.connect(onLauncherChanged); @@ -949,7 +933,6 @@ AbilityBasicItem { root.draggingFinished.disconnect(handlerDraggingFinished); root.publishTasksGeometries.disconnect(slotPublishGeometries); root.showPreviewForTasks.disconnect(slotShowPreviewForTasks); - root.mimicEnterForParabolic.disconnect(slotMimicEnterForParabolic); taskItem.abilities.launchers.launcherChanged.disconnect(onLauncherChanged); taskItem.abilities.launchers.launcherRemoved.disconnect(onLauncherChanged); diff --git a/plasmoid/package/contents/ui/task/TaskMouseArea.qml b/plasmoid/package/contents/ui/task/TaskMouseArea.qml index c450d500b..9f97acda1 100644 --- a/plasmoid/package/contents/ui/task/TaskMouseArea.qml +++ b/plasmoid/package/contents/ui/task/TaskMouseArea.qml @@ -77,9 +77,6 @@ MouseArea { // IMPORTANT: This must be improved ! even for small milliseconds it reduces performance onPositionChanged: { - if ((inBlockingAnimation && !(inAttentionAnimation||inFastRestoreAnimation||inMimicParabolicAnimation))) - return; - if (taskItem.abilities.myView.isReady && !taskItem.abilities.myView.isShownFully) { return; } diff --git a/plasmoid/package/contents/ui/task/abilitybasicitem/HiddenSpacer.qml b/plasmoid/package/contents/ui/task/abilitybasicitem/HiddenSpacer.qml index 6a64ed66c..9bca58023 100644 --- a/plasmoid/package/contents/ui/task/abilitybasicitem/HiddenSpacer.qml +++ b/plasmoid/package/contents/ui/task/abilitybasicitem/HiddenSpacer.qml @@ -54,7 +54,7 @@ Item{ value: { if (isForcedHidden) { return 0; - } else if (!inAttentionAnimation && !inMimicParabolicAnimation && !inFastRestoreAnimation) { + } else if (!inAttentionAnimation && !inFastRestoreAnimation) { return (nScale > 0) ? (maxSize * nScale) + separatorSpace : separatorSpace; } else { return (nScale > 0) ? (abilityItem.abilities.metrics.iconSize * nScale) + separatorSpace : separatorSpace; diff --git a/plasmoid/package/contents/ui/task/animations/FastRestoreAnimation.qml b/plasmoid/package/contents/ui/task/animations/FastRestoreAnimation.qml index 9a5afa6dc..ab10cdfec 100644 --- a/plasmoid/package/contents/ui/task/animations/FastRestoreAnimation.qml +++ b/plasmoid/package/contents/ui/task/animations/FastRestoreAnimation.qml @@ -62,20 +62,9 @@ SequentialAnimation{ } onStopped: { - /*if (!taskItem.containsMouse && !parabolicManager.neighbourIsHovered(itemIndex)) { - taskItem.inMimicParabolicAnimation = false; - } else { - taskItem.inMimicParabolicAnimation = true; - }*/ - newWindowAnimation.stop(); - //if (!taskItem.containsMouse && !parabolicManager.neighbourIsHovered(itemIndex)) { taskItem.inBlockingAnimation = false; - //} - - root.mimicEnterForParabolic(); - taskItem.inFastRestoreAnimation = false; // console.log("Fast Restore Animation ended..."); }