From c9422bc439cf8564b05af3a735f04b09c540a44e Mon Sep 17 00:00:00 2001 From: Devin Lin Date: Wed, 6 Apr 2022 21:01:18 -0400 Subject: [PATCH] homescreen: Fix config options coming up when holding on search and switcher --- containments/homescreen/package/contents/ui/HomeScreen.qml | 7 +++++-- .../homescreen/package/contents/ui/HomeScreenContents.qml | 2 +- .../homescreen/package/contents/ui/HomeScreenState.qml | 3 +++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/containments/homescreen/package/contents/ui/HomeScreen.qml b/containments/homescreen/package/contents/ui/HomeScreen.qml index cab32832..d25a0509 100644 --- a/containments/homescreen/package/contents/ui/HomeScreen.qml +++ b/containments/homescreen/package/contents/ui/HomeScreen.qml @@ -27,6 +27,8 @@ Item { property bool interactive: true property var homeScreenState: HomeScreenState { + interactive: root.interactive + totalPagesWidth: pages.contentWidth appDrawerFlickable: appDrawer.flickable @@ -105,16 +107,17 @@ Item { TapHandler { target: favoriteStrip + enabled: homeScreenState.interactive onTapped: { //Hides icons close button contents.appletsLayout.appletsLayoutInteracted(); contents.appletsLayout.editMode = false; } onLongPressed: { - if (homeScreenState.currentSwipeState === HomeScreenState.DeterminingType) { + if (homeScreenState.currentSwipeState === HomeScreenState.DeterminingType) { // only go into edit mode when not in a swipe contents.appletsLayout.editMode = true; - } + } } onPressedChanged: root.parent.focus = true; } diff --git a/containments/homescreen/package/contents/ui/HomeScreenContents.qml b/containments/homescreen/package/contents/ui/HomeScreenContents.qml index 3ba2768e..82c7cbc9 100644 --- a/containments/homescreen/package/contents/ui/HomeScreenContents.qml +++ b/containments/homescreen/package/contents/ui/HomeScreenContents.qml @@ -159,7 +159,7 @@ DragDrop.DropArea { TapHandler { target: homeScreenPages - enabled: homeScreenState.currentView === HomeScreenState.PageView + enabled: homeScreenState.currentView === HomeScreenState.PageView && homeScreenState.interactive onTapped: { //Hides icons close button appletsLayout.appletsLayoutInteracted(); diff --git a/containments/homescreen/package/contents/ui/HomeScreenState.qml b/containments/homescreen/package/contents/ui/HomeScreenState.qml index 6168915b..1fdd2120 100644 --- a/containments/homescreen/package/contents/ui/HomeScreenState.qml +++ b/containments/homescreen/package/contents/ui/HomeScreenState.qml @@ -18,6 +18,9 @@ import org.kde.plasma.private.mobileshell 1.0 as MobileShell QtObject { id: root + // whether the homescreen elements should be interactive, or disabled + required property bool interactive + required property real totalPagesWidth required property var appDrawerFlickable