kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-23 13:33:50 +03:00
Code Issues Projects Releases Wiki Activity

animations improvements

Browse Source 
--animate tasks hidden spacers properly
when a task is inAttention and the user
enters the mouse at first time when the task
isnt zoomed
--improve tasks hidden spacers animated
behaviors
--improve applets hidden spacers animated
behaviors
This commit is contained in:
Michail Vourlakos 2018-03-16 09:29:27 +02:00
parent 607d6b4f4a
commit 35f53e6428
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
containment/package/contents/ui/applet/AppletHiddenSpacer.qml
View File

@ -42,13 +42,15 @@ Item{
property real nScale: 0
Behavior on nScale {
enabled: !root.globalDirectRender
Behavior on nHiddenSize {
id: animatedBehavior
enabled: !root.globalDirectRender || restoreAnimation.running
NumberAnimation { duration: 3 * container.animationTime }
}
Behavior on nScale {
enabled: root.globalDirectRender && !restoreAnimation.running
Behavior on nHiddenSize {
id: directBehavior
enabled: !animatedBehavior.running
NumberAnimation { duration: root.directRenderAnimationTime }
}

16
plasmoid/package/contents/ui/task/TaskHiddenSpacer.qml
View File

@ -47,7 +47,7 @@ Item{
property int separatorSpace: neighbourSeparator && !isSeparator
&& !(parabolicManager.hasInternalSeparator && root.dragSource)
&& !root.inActivityChange ? //fix for #846
(2+root.iconMargin/2) : 0
(2+root.iconMargin/2) : 0
property bool rightSpacer: false
@ -105,15 +105,17 @@ Item{
Component.onCompleted: hiddenSpacer.updateNeighbour();
Behavior on separatorSpace {
enabled: mainItemContainer.inFastRestoreAnimation || showWindowAnimation.running || root.inActivityChange
Behavior on nHiddenSize {
id: animatedBehavior
enabled: (mainItemContainer.inFastRestoreAnimation || showWindowAnimation.running || restoreAnimation.running
|| root.inActivityChange || mainItemContainer.inRemoveStage)
|| (mainItemContainer.containsMouse && inAttentionAnimation && wrapper.mScale!==root.zoomFactor)
NumberAnimation{ duration: 3 * mainItemContainer.animationTime }
}
Behavior on separatorSpace {
enabled: !mainItemContainer.inFastRestoreAnimation && !showWindowAnimation.running
&& !restoreAnimation.running && !root.inActivityChange
Behavior on nHiddenSize {
id: directBehavior
enabled: !animatedBehavior.running
NumberAnimation { duration: root.directRenderAnimationTime }
}

8
plasmoid/package/contents/ui/task/TaskWrapper.qml
View File

@ -254,8 +254,14 @@ Item{
hiddenSpacerRight.nScale = scales.rightScale - 1;
}
if (!mainItemContainer.inAttentionAnimation)
if (!mainItemContainer.inAttentionAnimation) {
mScale = root.zoomFactor;
} else {
var subSpacerScale = (root.zoomFactor-1)/2;
hiddenSpacerLeft.nScale = subSpacerScale;
hiddenSpacerRight.nScale = subSpacerScale;
}
mainItemContainer.scalesUpdatedOnce = false;
}