From 6567c77ba23b4e8aec64821e4ddd0548193d8b46 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sat, 21 Jan 2023 13:21:19 +0100
Subject: [PATCH] Don't dispatch gestures in widget edit mode

---
 .../de/mm20/launcher2/ui/launcher/PagerScaffold.kt     |  8 ++++----
 .../de/mm20/launcher2/ui/launcher/PullDownScaffold.kt  | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
index 41738d5c..b5a26296 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt
@@ -254,7 +254,7 @@ fun PagerScaffold(
                 available: Offset,
                 source: NestedScrollSource
             ): Offset {
-                if (source == NestedScrollSource.Drag) gestureManager.dispatchDrag(available)
+                if (source == NestedScrollSource.Drag && !isWidgetEditMode) gestureManager.dispatchDrag(available)
                 val deltaSearchBarOffset =
                     consumed.y * if (isSearchOpen && reverseSearchResults) 1 else -1
                 searchBarOffset.value =
@@ -263,7 +263,7 @@ fun PagerScaffold(
             }
 
             override suspend fun onPreFling(available: Velocity): Velocity {
-                gestureManager.dispatchDragEnd()
+                if (!isWidgetEditMode) gestureManager.dispatchDragEnd()
                 return super.onPreFling(available)
             }
         }
@@ -346,10 +346,10 @@ fun PagerScaffold(
                                     .pointerInput(Unit) {
                                         detectTapGestures(
                                             onDoubleTap = {
-                                                gestureManager.dispatchDoubleTap(it)
+                                                if (!isWidgetEditMode) gestureManager.dispatchDoubleTap(it)
                                             },
                                             onLongPress = {
-                                                gestureManager.dispatchLongPress(it)
+                                                if (!isWidgetEditMode) gestureManager.dispatchLongPress(it)
                                             }
                                         )
                                     }
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
index 56464d93..00ce2914 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PullDownScaffold.kt
@@ -315,7 +315,7 @@ fun PullDownScaffold(
                 if (offsetY.value > toggleSearchThreshold || offsetY.value < -toggleSearchThreshold) {
                     viewModel.toggleSearch()
                 }
-                gestureManager.dispatchDragEnd()
+                if (!isWidgetEditMode) gestureManager.dispatchDragEnd()
                 if (offsetY.value != 0f) {
                     offsetY.animateTo(0f)
                     return available
@@ -331,10 +331,10 @@ fun PullDownScaffold(
             .pointerInput(Unit) {
                 detectHorizontalDragGestures(
                     onDragEnd = {
-                        gestureManager.dispatchDragEnd()
+                        if (!isWidgetEditMode) gestureManager.dispatchDragEnd()
                     },
                     onHorizontalDrag = { _, dragAmount ->
-                        gestureManager.dispatchDrag(Offset(dragAmount, 0f))
+                        if (!isWidgetEditMode) gestureManager.dispatchDrag(Offset(dragAmount, 0f))
                     }
                 )
             }
@@ -388,10 +388,10 @@ fun PullDownScaffold(
                                     .pointerInput(Unit) {
                                         detectTapGestures(
                                             onDoubleTap = {
-                                                gestureManager.dispatchDoubleTap(it)
+                                                if (!isWidgetEditMode) gestureManager.dispatchDoubleTap(it)
                                             },
                                             onLongPress = {
-                                                gestureManager.dispatchLongPress(it)
+                                                if (!isWidgetEditMode) gestureManager.dispatchLongPress(it)
                                             }
                                         )
                                     }