From 434ec6fdf91a2bc973436dc8513e1babdea7b325 Mon Sep 17 00:00:00 2001 From: Marco Martin Date: Thu, 1 Apr 2021 17:43:26 +0200 Subject: [PATCH] clicking panel home button goes to page 0 --- .../package/contents/ui/launcher/FlickablePages.qml | 5 +++++ containments/homescreen/package/contents/ui/main.qml | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/containments/homescreen/package/contents/ui/launcher/FlickablePages.qml b/containments/homescreen/package/contents/ui/launcher/FlickablePages.qml index 7a4bdb41..fec24f84 100644 --- a/containments/homescreen/package/contents/ui/launcher/FlickablePages.qml +++ b/containments/homescreen/package/contents/ui/launcher/FlickablePages.qml @@ -97,6 +97,11 @@ Flickable { scrollAnim.to = mainFlickable.width * Math.floor(mainFlickable.contentX / mainFlickable.width) scrollAnim.running = true; } + function scrollToPage(index) { + scrollAnim.running = false; + scrollAnim.to = mainFlickable.width * Math.max(0, Math.min(index, mainFlickable.contentWidth - mainFlickable.width)) + scrollAnim.running = true; + } Timer { id: autoScrollTimer diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml index 7af923d3..f5fb804c 100644 --- a/containments/homescreen/package/contents/ui/main.qml +++ b/containments/homescreen/package/contents/ui/main.qml @@ -72,8 +72,7 @@ FocusScope { property real lastRequestedPosition: 0 target: MobileShell.HomeScreenControls function onResetHomeScreenPosition() { - scrollAnim.to = 0; - scrollAnim.restart(); + mainFlickable.scrollToPage(0); appDrawer.close(); } function onSnapHomeScreenPosition() {