From e04a96bcb695e34469de43157c3faa22773126ea Mon Sep 17 00:00:00 2001 From: MM20 <15646950+MM2-0@users.noreply.github.com> Date: Wed, 12 Jul 2023 21:01:43 +0200 Subject: [PATCH] Fix swipe gestures in swipe right layout --- .../main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 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 7c099b24..d5fb2265 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 @@ -289,7 +289,7 @@ fun PagerScaffold( val density = LocalDensity.current val maxSearchBarOffset = with(density) { 128.dp.toPx() } - val pagerNestedScrollConnection = remember { + val pagerNestedScrollConnection = remember(reverse) { object : NestedScrollConnection { override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset { val drag = gestureManager.currentDrag @@ -706,7 +706,7 @@ fun Modifier.pagerScaffoldScrollHandler( val available = dragAmount - preConsumed val consumedY = scrollableState.scrollBy(available.y * scrollMultiplier) * scrollMultiplier - val consumedX = pagerState.scrollBy(available.x * pagerMultiplier) * -1f + val consumedX = pagerState.scrollBy(available.x * pagerMultiplier) * pagerMultiplier val totalConsumed = Offset(preConsumed.x + consumedX, preConsumed.y + consumedY) nestedScrollDispatcher.dispatchPostScroll(