From 0d3ad6fd2ea351a7103dcfe14850d95f9b280467 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Fri, 11 Oct 2019 15:21:24 +0200 Subject: [PATCH] stop at bounds for the top panel --- containments/panel/package/contents/ui/SlidingPanel.qml | 1 + containments/panel/package/contents/ui/main.qml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/containments/panel/package/contents/ui/SlidingPanel.qml b/containments/panel/package/contents/ui/SlidingPanel.qml index bca2d828..4ceac950 100644 --- a/containments/panel/package/contents/ui/SlidingPanel.qml +++ b/containments/panel/package/contents/ui/SlidingPanel.qml @@ -164,6 +164,7 @@ NanoShell.FullScreenOverlay { onContentYChanged: { window.offset = -contentY + contentArea.height } + boundsBehavior: Flickable.StopAtBounds contentWidth: window.width contentHeight: window.height*2 bottomMargin: window.height diff --git a/containments/panel/package/contents/ui/main.qml b/containments/panel/package/contents/ui/main.qml index 173f8339..8d3b0fb2 100644 --- a/containments/panel/package/contents/ui/main.qml +++ b/containments/panel/package/contents/ui/main.qml @@ -252,7 +252,7 @@ PlasmaCore.ColorScope { slidingPanel.showFullScreen(); } onPositionChanged: { - slidingPanel.offset = slidingPanel.offset + (mouse.y - oldMouseY); + slidingPanel.offset = Math.min(slidingPanel.contentItem.height, slidingPanel.offset + (mouse.y - oldMouseY)); oldMouseY = mouse.y; } onReleased: {