瀏覽代碼

VerticalFastScroller: Fix incorrect touch target (#7384)

Ivan Iskandar 2 年之前
父節點
當前提交
9ff6ae81bd
共有 1 個文件被更改,包括 13 次插入13 次删除
  1. 13 13
      app/src/main/java/eu/kanade/presentation/components/VerticalFastScroller.kt

+ 13 - 13
app/src/main/java/eu/kanade/presentation/components/VerticalFastScroller.kt

@@ -114,18 +114,6 @@ fun VerticalFastScroller(
             Box(
                 modifier = Modifier
                     .offset { IntOffset(0, thumbOffsetY.roundToInt()) }
-                    .height(ThumbLength)
-                    .then(
-                        // Exclude thumb from gesture area only when needed
-                        if (isThumbVisible && !isThumbDragged && !listState.isScrollInProgress) {
-                            Modifier.systemGestureExclusion()
-                        } else Modifier,
-                    )
-                    .padding(horizontal = 8.dp)
-                    .padding(end = endContentPadding)
-                    .width(ThumbThickness)
-                    .alpha(alpha.value)
-                    .background(color = thumbColor, shape = ThumbShape)
                     .then(
                         // Recompose opts
                         if (!listState.isScrollInProgress) {
@@ -139,7 +127,19 @@ fun VerticalFastScroller(
                                 },
                             )
                         } else Modifier,
-                    ),
+                    )
+                    .then(
+                        // Exclude thumb from gesture area only when needed
+                        if (isThumbVisible && !isThumbDragged && !listState.isScrollInProgress) {
+                            Modifier.systemGestureExclusion()
+                        } else Modifier,
+                    )
+                    .height(ThumbLength)
+                    .padding(horizontal = 8.dp)
+                    .padding(end = endContentPadding)
+                    .width(ThumbThickness)
+                    .alpha(alpha.value)
+                    .background(color = thumbColor, shape = ThumbShape),
             )
         }.map { it.measure(scrollerConstraints) }
         val scrollerWidth = scrollerPlaceable.fastMaxBy { it.width }?.width ?: 0