From ba2d6bf64d1c33d2e6b9fa3e2612a58199e50792 Mon Sep 17 00:00:00 2001 From: Yari Polla Date: Wed, 20 Apr 2022 21:53:02 +0200 Subject: [PATCH] homescreen: deactivate home screen flick container when an applet is in edit mode --- .../homescreen/package/contents/ui/HomeScreen.qml | 8 ++++---- .../homescreen/package/contents/ui/HomeScreenContents.qml | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/containments/homescreen/package/contents/ui/HomeScreen.qml b/containments/homescreen/package/contents/ui/HomeScreen.qml index d25a0509..a560cd2d 100644 --- a/containments/homescreen/package/contents/ui/HomeScreen.qml +++ b/containments/homescreen/package/contents/ui/HomeScreen.qml @@ -25,10 +25,10 @@ Item { id: root property bool interactive: true - + property var homeScreenState: HomeScreenState { interactive: root.interactive - + totalPagesWidth: pages.contentWidth appDrawerFlickable: appDrawer.flickable @@ -56,8 +56,8 @@ Item { homeScreenState: root.homeScreenState // disable flick tracking when necessary - interactive: root.interactive && homeScreenState.currentView !== HomeScreenState.AppDrawerView - + interactive: root.interactive && homeScreenState.currentView !== HomeScreenState.AppDrawerView && !contents.inAppletEditMode + // item is effectively anchored to root, while allowing flickContainer // to keep track of flicks Item { diff --git a/containments/homescreen/package/contents/ui/HomeScreenContents.qml b/containments/homescreen/package/contents/ui/HomeScreenContents.qml index 82c7cbc9..e253ea87 100644 --- a/containments/homescreen/package/contents/ui/HomeScreenContents.qml +++ b/containments/homescreen/package/contents/ui/HomeScreenContents.qml @@ -50,6 +50,8 @@ DragDrop.DropArea { favoriteStrip: dropArea.favoriteStrip } + property bool inAppletEditMode: false + Connections { target: plasmoid function onEditModeChanged() { @@ -200,6 +202,10 @@ DragDrop.DropArea { appletContainerComponent: MobileAppletContainer { homeScreenState: dropArea.homeScreenState launcherDragManager: dropArea.launcherDragManager + + onEditModeChanged: { + inAppletEditMode = editMode; + } } placeHolder: ContainmentLayoutManager.PlaceHolder {}