diff --git a/containment/contents/ui/VisibilityManager.qml b/containment/contents/ui/VisibilityManager.qml index 22de08464..2230e6a41 100644 --- a/containment/contents/ui/VisibilityManager.qml +++ b/containment/contents/ui/VisibilityManager.qml @@ -411,13 +411,14 @@ Item{ function init() { // if (!dock.visibility.blockHiding) inSlidingIn = true; - dock.visibility.isHidden = false; - updateMaskArea(); if (slidingAnimationAutoHiddenOut.running) { slidingAnimationAutoHiddenOut.stop(); } + dock.visibility.isHidden = false; + updateMaskArea(); + start(); } } diff --git a/containment/contents/ui/main.qml b/containment/contents/ui/main.qml index 532a547f4..51d1e0d4f 100644 --- a/containment/contents/ui/main.qml +++ b/containment/contents/ui/main.qml @@ -1129,11 +1129,11 @@ DragDrop.DropArea { && !root.editMode && windowSystem.compositingActive && !root.drawShadowsExternal ){ return ((dock.width/2) - (root.maxLength/2)) } else { - if ((visibilityManager.inSlidingIn || visibilityManager.inSlidingOut) && root.isHorizontal){ + if ((visibilityManager.inSlidingIn || visibilityManager.inSlidingOut) && root.isVertical){ return; } - if (dock.visibility.isHidden && windowSystem.compositingActive) { + if (dock.visibility.isHidden && windowSystem.compositingActive && root.isVertical) { return visibilityManager.slidingOutToPos; } else { return 0; @@ -1150,7 +1150,7 @@ DragDrop.DropArea { return; } - if (dock.visibility.isHidden && windowSystem.compositingActive) { + if (dock.visibility.isHidden && windowSystem.compositingActive && root.isHorizontal) { return visibilityManager.slidingOutToPos; } else { return 0; @@ -1158,6 +1158,10 @@ DragDrop.DropArea { } } + onXChanged: { + console.log("X: "+x); + } + width: (plasmoid.configuration.panelPosition === Latte.Dock.Justify) && root.isHorizontal && !root.editMode && !root.drawShadowsExternal ? root.maxLength : parent.width height: (plasmoid.configuration.panelPosition === Latte.Dock.Justify) && root.isVertical && !root.editMode && !root.drawShadowsExternal ?