Revert back two last commits

--the expose of directRenderAnimationTime broke
the parabolic effect experience so I am reverting them
back
pull/1/head
Michail Vourlakos 8 years ago
parent d15b84319c
commit f3581a750b

@ -326,8 +326,13 @@ Item {
property real nScale: 0 property real nScale: 0
Behavior on nScale { Behavior on nScale {
NumberAnimation { duration: root.globalDirectRender ? enabled: !root.globalDirectRender
root.directRenderAnimationTime : 3*container.animationTime } NumberAnimation { duration: 3*container.animationTime }
}
Behavior on nScale {
enabled: root.globalDirectRender
NumberAnimation { duration: root.directRenderAnimationTime }
} }
Loader{ Loader{
@ -832,8 +837,13 @@ Item {
} }
Behavior on zoomScale { Behavior on zoomScale {
NumberAnimation { duration: root.globalDirectRender ? enabled: !root.globalDirectRender
root.directRenderAnimationTime : 3*container.animationTime } NumberAnimation { duration: 3*container.animationTime }
}
Behavior on zoomScale {
enabled: root.globalDirectRender
NumberAnimation { duration: root.directRenderAnimationTime }
} }
//!this is used in order to update the index when the signal is for the internal latte plasmoid //!this is used in order to update the index when the signal is for the internal latte plasmoid
@ -912,7 +922,7 @@ Item {
} }
} }
if(!root.latteApplet || Math.abs(root.latteAppletPos-index)>1 || !root.hasInternalSeparator if(!root.latteApplet || Math.abs(root.latteAppletPos-index)>1
|| (root.hasInternalSeparator || (root.hasInternalSeparator
&& ((root.latteApplet.internalSeparatorPos>0 && root.latteApplet.internalSeparatorPos<root.tasksCount-1) && ((root.latteApplet.internalSeparatorPos>0 && root.latteApplet.internalSeparatorPos<root.tasksCount-1)
|| (root.latteApplet.internalSeparatorPos===0 && index>root.latteAppletPos) || (root.latteApplet.internalSeparatorPos===0 && index>root.latteAppletPos)
@ -1013,8 +1023,13 @@ Item {
property real nScale: 0 property real nScale: 0
Behavior on nScale { Behavior on nScale {
NumberAnimation { duration: root.globalDirectRender ? enabled: !root.globalDirectRender
root.directRenderAnimationTime : 3*container.animationTime } NumberAnimation { duration: 3*container.animationTime }
}
Behavior on nScale {
enabled: root.globalDirectRender
NumberAnimation { duration: root.directRenderAnimationTime }
} }
Loader{ Loader{

@ -272,8 +272,13 @@ MouseArea{
property real nScale: 0 property real nScale: 0
Behavior on nScale { Behavior on nScale {
NumberAnimation { duration: root.globalDirectRender ? enabled: !root.globalDirectRender
root.directRenderAnimationTime : 3 * mainItemContainer.animationTime } NumberAnimation { duration: 3 * mainItemContainer.animationTime }
}
Behavior on nScale {
enabled: root.globalDirectRender
NumberAnimation { duration: root.directRenderAnimationTime }
} }
/* Rectangle{ /* Rectangle{
@ -389,8 +394,13 @@ MouseArea{
}*/ }*/
Behavior on mScale { Behavior on mScale {
NumberAnimation { duration: root.globalDirectRender ? enabled: !root.globalDirectRender
root.directRenderAnimationTime : 3 * mainItemContainer.animationTime } NumberAnimation { duration: 3 * mainItemContainer.animationTime }
}
Behavior on mScale {
enabled: root.globalDirectRender
NumberAnimation { duration: root.directRenderAnimationTime }
} }
Flow{ Flow{
@ -620,8 +630,13 @@ MouseArea{
property real nScale: 0 property real nScale: 0
Behavior on nScale { Behavior on nScale {
NumberAnimation { duration: root.globalDirectRender ? enabled: !root.globalDirectRender
root.directRenderAnimationTime : 3 * mainItemContainer.animationTime } NumberAnimation { duration: 3 * mainItemContainer.animationTime }
}
Behavior on nScale {
enabled: root.globalDirectRender
NumberAnimation { duration: root.directRenderAnimationTime }
} }
/* Rectangle{ /* Rectangle{

Loading…
Cancel
Save