Merge pull request #1245 from ZalithLauncher/fix/control_pointer_conflict#1

fix(控制): 指针抬起时释放活跃组件 & 指针占用逻辑

Author: MovTery

LayerController/src/main/java/com/movtery/layer_controller/Layout.kt

@@ -170,6 +170,15 @@ private fun BoxWithConstraintsScope.BaseControlBoxLayout(
                             val pointerId = change.id
                             val isPressed = change.pressed
 
+                            //抬起时，总是尝试释放该指针下活跃的按钮
+                            //避免子级占用了指针后，导致按钮状态无法被释放
+                            if (!isPressed) {
+                                allActiveWidgets.remove(pointerId)?.forEach { widget ->
+                                    widget.onReleaseEvent(eventHandler, reversedLayers)
+                                }
+                                return@forEach
+                            }
+
                             if (
                                 change.isConsumed ||
                                 //不处理被子级占用的指针
@@ -285,10 +294,6 @@ private fun BoxWithConstraintsScope.BaseControlBoxLayout(
                                         }
                                     }
                                 }
-                            } else {
-                                allActiveWidgets.remove(pointerId)?.forEach { widget ->
-                                    widget.onReleaseEvent(eventHandler, reversedLayers)
-                                }
                             }
                         }
                     }

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/control/mouse/TouchInput.kt

@@ -163,14 +163,14 @@ fun TouchpadLayout(
                                     //是否被父级标记为仅处理滑动
                                     val isMoveOnly = isMoveOnlyPointer(pointerId)
 
-                                    //仅在未被父级消费且未被占用的情况下，尝试占用指针
-                                    if (!isMoveOnly && !change.isConsumed && pointerId !in occupiedPointers) {
-                                        onOccupiedPointer(pointerId)
-                                        occupiedPointers.add(pointerId)
-                                    }
-
                                     //如果没有活跃指针，且当前指针未被消费，则开始处理这个指针
                                     if (activePointer == null && (!change.isConsumed || isMoveOnly)) {
+                                        //fix: 只有真正成为 activePointer 的指针，才标记为已占用
+                                        if (!isMoveOnly && pointerId !in occupiedPointers) {
+                                            onOccupiedPointer(pointerId)
+                                            occupiedPointers.add(pointerId)
+                                        }
+
                                         activePointer = pointerId
 
                                         dragStates[pointerId] =