From c9ec2bc957d9caabe1bd2176c90863bfc0077fa3 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sun, 26 Apr 2020 17:45:57 +0300 Subject: [PATCH] rename minZoomFactor to animations.maxZoomFactor --- containment/package/contents/ui/abilities/Animations.qml | 2 +- containment/package/contents/ui/main.qml | 2 +- declarativeimports/abilities/applets/Animations.qml | 2 +- declarativeimports/abilities/containers/Animations.qml | 2 +- declarativeimports/abilities/definitions/Animations.qml | 2 +- plasmoid/package/contents/ui/abilities/Animations.qml | 2 +- plasmoid/package/contents/ui/main.qml | 2 +- .../package/contents/ui/task/animations/NewWindowAnimation.qml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/containment/package/contents/ui/abilities/Animations.qml b/containment/package/contents/ui/abilities/Animations.qml index 7594fe8e6..57677a92d 100644 --- a/containment/package/contents/ui/abilities/Animations.qml +++ b/containment/package/contents/ui/abilities/Animations.qml @@ -65,7 +65,7 @@ ContainerAbility.Animations { } } - minZoomFactor : { + maxZoomFactor : { if (!active || !LatteCore.WindowSystem.compositingActive) { return 1; } diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml index 775eef5f6..e9da186ac 100644 --- a/containment/package/contents/ui/main.qml +++ b/containment/package/contents/ui/main.qml @@ -503,7 +503,7 @@ Item { property int tasksCount: latteApplet ? latteApplet.tasksCount : 0 - property real maxZoomFactor: Math.max(zoomFactor, animations.minZoomFactor) + property real maxZoomFactor: Math.max(zoomFactor, animations.maxZoomFactor) property rect screenGeometry: latteView ? latteView.screenGeometry : plasmoid.screenGeometry diff --git a/declarativeimports/abilities/applets/Animations.qml b/declarativeimports/abilities/applets/Animations.qml index 0e7503c2c..69902f7a6 100644 --- a/declarativeimports/abilities/applets/Animations.qml +++ b/declarativeimports/abilities/applets/Animations.qml @@ -38,7 +38,7 @@ AbilityDefinition.Animations { speedFactor: bridge ? bridge.animations.speedFactor : local.speedFactor //! parabolic effect animations - minZoomFactor: bridge ? bridge.animations.minZoomFactor : local.minZoomFactor + maxZoomFactor: bridge ? bridge.animations.maxZoomFactor : local.maxZoomFactor hoverPixelSensitivity: bridge ? bridge.animations.hoverPixelSensitivity : local.hoverPixelSensitivity readonly property AbilityDefinition.Animations local: AbilityDefinition.Animations{} diff --git a/declarativeimports/abilities/containers/Animations.qml b/declarativeimports/abilities/containers/Animations.qml index 40f726495..6ef449aa1 100644 --- a/declarativeimports/abilities/containers/Animations.qml +++ b/declarativeimports/abilities/containers/Animations.qml @@ -38,7 +38,7 @@ AbilityDefinition.Animations { readonly property alias needThickness: apis.needThickness //! parabolic effect animations - readonly property alias minZoomFactor: apis.minZoomFactor + readonly property alias maxZoomFactor: apis.maxZoomFactor readonly property alias hoverPixelSensitivity: apis.hoverPixelSensitivity } } diff --git a/declarativeimports/abilities/definitions/Animations.qml b/declarativeimports/abilities/definitions/Animations.qml index 3ef0c1ad7..42b4943db 100644 --- a/declarativeimports/abilities/definitions/Animations.qml +++ b/declarativeimports/abilities/definitions/Animations.qml @@ -45,5 +45,5 @@ Item { //! animations related to parabolic effect property int hoverPixelSensitivity: 1 - property real minZoomFactor : 1.0 + property real maxZoomFactor : 1.0 } diff --git a/plasmoid/package/contents/ui/abilities/Animations.qml b/plasmoid/package/contents/ui/abilities/Animations.qml index 1753a9a81..41575ffb8 100644 --- a/plasmoid/package/contents/ui/abilities/Animations.qml +++ b/plasmoid/package/contents/ui/abilities/Animations.qml @@ -30,7 +30,7 @@ AppletAbility.Animations { active: speedFactor.current !== 0 hoverPixelSensitivity: 1 - minZoomFactor: speedFactor.current === 0 ? 1 : 1.65 + maxZoomFactor: speedFactor.current === 0 ? 1 : 1.65 speedFactor.normal: active ? speedFactor.current : 1.0 speedFactor.current: plasmoid.configuration.durationTime diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml index 49a8143a3..e55916625 100644 --- a/plasmoid/package/contents/ui/main.qml +++ b/plasmoid/package/contents/ui/main.qml @@ -232,7 +232,7 @@ Item { readonly property real currentPanelOpacity: latteView ? latteView.currentPanelTransparency / 100 : 1 - property real maxZoomFactor: latteView ? latteView.maxZoomFactor : Math.max(zoomFactor, animations.minZoomFactor) + property real maxZoomFactor: latteView ? latteView.maxZoomFactor : Math.max(zoomFactor, animations.maxZoomFactor) property real zoomFactor: latteView ? latteView.zoomFactor : ( 1 + (plasmoid.configuration.zoomLevel / 20) ) diff --git a/plasmoid/package/contents/ui/task/animations/NewWindowAnimation.qml b/plasmoid/package/contents/ui/task/animations/NewWindowAnimation.qml index 16186ace8..96282871a 100644 --- a/plasmoid/package/contents/ui/task/animations/NewWindowAnimation.qml +++ b/plasmoid/package/contents/ui/task/animations/NewWindowAnimation.qml @@ -41,7 +41,7 @@ SequentialAnimation{ PropertyAnimation { target: wrapper property: (icList.orientation == Qt.Vertical) ? "tempScaleWidth" : "tempScaleHeight" - to: 1 + (thickPercentage * 2 * (taskItem.animations.minZoomFactor-1)) + to: 1 + (thickPercentage * 2 * (taskItem.animations.maxZoomFactor-1)) duration: newWindowAnimation.speed easing.type: Easing.OutQuad