kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-26 11:21:40 +03:00
Code Issues Projects Releases Wiki Activity

fix glitch from editMode to real floating

Browse Source
This commit is contained in:
Michail Vourlakos 2020-01-03 19:18:52 +02:00
parent 783906d244
commit 813b40e9ca
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
containment/package/contents/ui/editmode/Visual.qml
View File

@ -51,6 +51,7 @@ Item{
property bool farEdge: (plasmoid.location===PlasmaCore.Types.BottomEdge) || (plasmoid.location===PlasmaCore.Types.RightEdge)
property bool editAnimationEnded: false
property bool editAnimationInFullThickness: false
property bool editAnimationRunning: false
property bool plasmaEditMode: plasmoid.userConfiguring
property bool inEditMode: false
@ -350,6 +351,7 @@ Item{
id:normalAnimationTransition
ScriptAction{
script:{
editVisual.editAnimationRunning = true;
editVisual.inEditMode = true;
imageTiler.opacity = 0
editVisual.editAnimationEnded = false;
@ -395,6 +397,7 @@ Item{
updateEffectsArea();
automaticItemSizer.updateAutomaticIconSize();
visibilityManager.updateMaskArea();
editVisual.editAnimationRunning = false;
}
}
}
@ -405,6 +408,7 @@ Item{
SequentialAnimation{
ScriptAction{
script: {
editVisual.editAnimationRunning = true;
editVisual.editAnimationInFullThickness = false;
//! remove kwin effects when starting the animation
latteView.effects.rect = Qt.rect(-1, -1, 0, 0);
@ -450,6 +454,7 @@ Item{
if (visibilityManager.inTempHiding) {
visibilityManager.sendSlidingOutAnimationEnded();
}
editVisual.editAnimationRunning = false;
}
}
}

3
containment/package/contents/ui/main.qml
View File

@ -648,7 +648,8 @@ Item {
}
Behavior on localScreenEdgeMargin {
enabled: !behaveAsPlasmaPanel
enabled: !root.behaveAsPlasmaPanel
&& !editModeVisual.editAnimationRunning /*avoid slide-out animation when from editMode we change to real floating*/
NumberAnimation {
duration: 0.8 * root.animationTime