From 7482182e24205b7a1c6728e68395a075f9b239ff Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 6 May 2017 11:15:55 +0300 Subject: [PATCH] set global direct render animation time --- containment/contents/ui/AppletItem.qml | 7 +++---- containment/contents/ui/main.qml | 1 + plasmoid/contents/ui/TaskDelegate.qml | 7 +++---- plasmoid/contents/ui/main.qml | 1 + 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/containment/contents/ui/AppletItem.qml b/containment/contents/ui/AppletItem.qml index 59805e550..669caeffa 100644 --- a/containment/contents/ui/AppletItem.qml +++ b/containment/contents/ui/AppletItem.qml @@ -70,7 +70,6 @@ Item { property int animationTime: root.durationTime* (1.2 *units.shortDuration) // 70 - property int directAnimationTime: 0 property int hoveredIndex: layoutsContainer.hoveredIndex property int index: -1 property int appletMargin: (applet && (applet.pluginName === root.plasmoidName)) @@ -333,7 +332,7 @@ Item { Behavior on nScale { enabled: root.globalDirectRender - NumberAnimation { duration: container.directAnimationTime } + NumberAnimation { duration: root.directRenderAnimationTime } } Loader{ @@ -844,7 +843,7 @@ Item { Behavior on zoomScale { enabled: root.globalDirectRender - NumberAnimation { duration: container.directAnimationTime } + NumberAnimation { duration: root.directRenderAnimationTime } } //!this is used in order to update the index when the signal is for the internal latte plasmoid @@ -1030,7 +1029,7 @@ Item { Behavior on nScale { enabled: root.globalDirectRender - NumberAnimation { duration: container.directAnimationTime } + NumberAnimation { duration: root.directRenderAnimationTime } } Loader{ diff --git a/containment/contents/ui/main.qml b/containment/contents/ui/main.qml index bacb455a3..9fe7b7fb6 100644 --- a/containment/contents/ui/main.qml +++ b/containment/contents/ui/main.qml @@ -48,6 +48,7 @@ DragDrop.DropArea { property bool debugMode: Qt.application.arguments.indexOf("--graphics")>=0 property bool globalDirectRender: false //it is used as a globalDirectRender for all elements in the dock property bool directRenderTimerIsRunning: enableDirectRenderTimer.running + property int directRenderAnimationTime: 20 property bool addLaunchersMessage: false property bool addLaunchersInTaskManager: plasmoid.configuration.addLaunchersInTaskManager diff --git a/plasmoid/contents/ui/TaskDelegate.qml b/plasmoid/contents/ui/TaskDelegate.qml index 96cbc7b5d..bb51ca556 100644 --- a/plasmoid/contents/ui/TaskDelegate.qml +++ b/plasmoid/contents/ui/TaskDelegate.qml @@ -94,7 +94,6 @@ MouseArea{ property int animationTime: root.durationTime * 1.2 * units.shortDuration property int badgeIndicator: 0 //it is used from external apps - property int directAnimationTime: 0 property int hoveredIndex: icList.hoveredIndex property int itemIndex: index property int lastValidIndex: -1 //used for the removal animation @@ -279,7 +278,7 @@ MouseArea{ Behavior on nScale { enabled: root.globalDirectRender - NumberAnimation { duration: mainItemContainer.directAnimationTime } + NumberAnimation { duration: root.directRenderAnimationTime } } /* Rectangle{ @@ -401,7 +400,7 @@ MouseArea{ Behavior on mScale { enabled: root.globalDirectRender - NumberAnimation { duration: mainItemContainer.directAnimationTime } + NumberAnimation { duration: root.directRenderAnimationTime } } Flow{ @@ -637,7 +636,7 @@ MouseArea{ Behavior on nScale { enabled: root.globalDirectRender - NumberAnimation { duration: mainItemContainer.directAnimationTime } + NumberAnimation { duration: root.directRenderAnimationTime } } /* Rectangle{ diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml index e792dbe20..42f664d78 100644 --- a/plasmoid/contents/ui/main.qml +++ b/plasmoid/contents/ui/main.qml @@ -143,6 +143,7 @@ Item { property bool smartLaunchersEnabled: latteDock ? latteDock.smartLaunchersEnabled : plasmoid.configuration.smartLaunchersEnabled property bool threeColorsWindows: latteDock ? latteDock.threeColorsWindows : plasmoid.configuration.threeColorsWindows + property int directRenderAnimationTime: latteDock ? latteDock.directRenderAnimationTime : 20 property int dockHoveredIndex : latteDock ? latteDock.hoveredIndex : -1 property int iconMargin: latteDock ? latteDock.iconMargin : 0.12*iconSize property int iconSize: latteDock ? latteDock.iconSize : Math.max(plasmoid.configuration.iconSize, 16)