diff --git a/containments/panel/contents/ui/SlidingPanel.qml b/containments/panel/contents/ui/SlidingPanel.qml index 8e833c7a..7127589b 100644 --- a/containments/panel/contents/ui/SlidingPanel.qml +++ b/containments/panel/contents/ui/SlidingPanel.qml @@ -39,7 +39,7 @@ FullScreenPanel { property alias fixedArea: fixedArea function open() { window.visible = true; - openAnim.running = true; + peekAnim.running = true; } function close() { closeAnim.running = true; @@ -49,6 +49,8 @@ FullScreenPanel { close(); } else if (offset < peekHeight) { open(); + } else if (mainFlickable.contentY < 0) { + openAnim.running = true; } } @@ -75,7 +77,7 @@ FullScreenPanel { } } PropertyAnimation { - id: openAnim + id: peekAnim target: window duration: units.longDuration easing.type: Easing.InOutQuad @@ -83,6 +85,15 @@ FullScreenPanel { from: window.offset to: window.peekHeight } + PropertyAnimation { + id: openAnim + target: window + duration: units.longDuration + easing.type: Easing.InOutQuad + properties: "offset" + from: window.offset + to: contentArea.height + } Rectangle { anchors.fill: parent @@ -90,7 +101,6 @@ FullScreenPanel { } PlasmaCore.ColorScope { - id: slidingArea anchors.fill: parent y: Math.min(0, -height + window.offset) colorGroup: PlasmaCore.Theme.ComplementaryColorGroup