use a new zoom-in animation type

7 years ago · c129743aa9
parent 2957c50dd0
commit c129743aa9
5 changed files with 17 additions and 10 deletions
--- a/containment/package/contents/ui/applet/AppletHiddenSpacer.qml
+++ b/containment/package/contents/ui/applet/AppletHiddenSpacer.qml
@ -44,11 +44,11 @@ Item{

    Behavior on nScale {
        enabled: !root.globalDirectRender
-        NumberAnimation { duration: 3*container.animationTime }
+        NumberAnimation { duration: 3 * container.animationTime }
    }

    Behavior on nScale {
-        enabled: root.globalDirectRender
+        enabled: root.globalDirectRender && !restoreAnimation.running
        NumberAnimation { duration: root.directRenderAnimationTime }
    }

--- a/containment/package/contents/ui/applet/AppletItemWrapper.qml
+++ b/containment/package/contents/ui/applet/AppletItemWrapper.qml
@ -609,11 +609,14 @@ Item{

    Behavior on zoomScale {
        enabled: !root.globalDirectRender
-        NumberAnimation { duration: 3*container.animationTime }
+        NumberAnimation {
+            duration: 4 * container.animationTime
+            easing.type: Easing.OutCubic
+        }
    }

    Behavior on zoomScale {
-        enabled: root.globalDirectRender
+        enabled: root.globalDirectRender && !restoreAnimation.running
        NumberAnimation { duration: root.directRenderAnimationTime }
    }

--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@ -1540,7 +1540,7 @@ DragDrop.DropArea {
                if (enableDirectRenderTimer.running)
                    enableDirectRenderTimer.stop();

-                root.globalDirectRender = false;
+                setGlobalDirectRender(false);
                root.clearZoom();
            }

@ -1560,7 +1560,7 @@ DragDrop.DropArea {
            if (latteApplet && latteApplet.waitingLaunchers.length > 0)
                return;

-            if (dock.visibility.containsMouse && !rootMouseArea.containsMouse){
+            if (dock.visibility.containsMouse && !rootMouseArea.containsMouse && mouseInCanBeHoveredApplet()){
                setGlobalDirectRender(true);
            }

--- a/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml
+++ b/plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml
@ -20,6 +20,7 @@

 import QtQuick 2.0

+import org.kde.latte 0.1 as Latte

 Item{
    id: hiddenSpacer
@ -98,11 +99,11 @@ Item{

    Behavior on separatorSpace {
        enabled: mainItemContainer.inFastRestoreAnimation || showWindowAnimation.running
-        NumberAnimation { duration: 3 * mainItemContainer.animationTime }
+        NumberAnimation{ duration: 3 * mainItemContainer.animationTime }
    }

    Behavior on separatorSpace {
-        enabled: !mainItemContainer.inFastRestoreAnimation && !showWindowAnimation.running
+        enabled: !mainItemContainer.inFastRestoreAnimation && !showWindowAnimation.running && !restoreAnimation.running
        NumberAnimation { duration: root.directRenderAnimationTime }
    }

--- a/plasmoid/package/contents/ui/task/TaskWrapper.qml
+++ b/plasmoid/package/contents/ui/task/TaskWrapper.qml
@ -118,11 +118,14 @@ Item{

    Behavior on mScale {
        enabled: !root.globalDirectRender || inMimicParabolicAnimation
-        NumberAnimation { duration: 3 * mainItemContainer.animationTime }
+        NumberAnimation{
+            duration: 4 * mainItemContainer.animationTime
+            easing.type: Easing.OutCubic
+        }
    }

    Behavior on mScale {
-        enabled: root.globalDirectRender && !inMimicParabolicAnimation
+        enabled: root.globalDirectRender && !inMimicParabolicAnimation && !restoreAnimation.running
        NumberAnimation { duration: root.directRenderAnimationTime }
    }