Skip to content

Commit f723ba0

Browse files
committed
Fix pager gesture triggers
1 parent 2da3255 commit f723ba0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

app/ui/src/main/java/de/mm20/launcher2/ui/launcher/PagerScaffold.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ fun PagerScaffold(
267267
val density = LocalDensity.current
268268
val maxSearchBarOffset = with(density) { 128.dp.toPx() }
269269

270-
val nestedScrollConnection = remember {
270+
val pagerNestedScrollConnection = remember {
271271
object : NestedScrollConnection {
272272
override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
273273
val drag = gestureManager.currentDrag
@@ -305,6 +305,10 @@ fun PagerScaffold(
305305
}
306306
}
307307

308+
val innerNestedScrollConnection = remember {
309+
object: NestedScrollConnection {}
310+
}
311+
308312
LaunchedEffect(pagerState.currentPage) {
309313
searchBarOffset.animateTo(0f)
310314
}
@@ -342,7 +346,9 @@ fun PagerScaffold(
342346
) {
343347

344348
HorizontalPager(
345-
modifier = Modifier.fillMaxSize(),
349+
modifier = Modifier
350+
.fillMaxSize()
351+
.nestedScroll(pagerNestedScrollConnection),
346352
beyondBoundsPageCount = 1,
347353
reverseLayout = reverse,
348354
state = pagerState,
@@ -353,8 +359,7 @@ fun PagerScaffold(
353359
stiffness = Spring.StiffnessMediumLow,
354360
),
355361
),
356-
// FIXME: Workaround https://issuetracker.google.com/issues/276738324
357-
pageNestedScrollConnection = nestedScrollConnection
362+
pageNestedScrollConnection = innerNestedScrollConnection,
358363
) {
359364
when (it) {
360365
0 -> {
@@ -568,8 +573,3 @@ fun PagerScaffold(
568573
onHomeButtonPress = handleBackOrHomeEvent,
569574
)
570575
}
571-
572-
private enum class Page {
573-
Widgets,
574-
Search
575-
}

0 commit comments

Comments
 (0)