修复惯性滚动可能导致弹出菜单错位的问题 (#4857)

Author: Glavo

HMCL/src/main/java/org/jackhuang/hmcl/ui/ScrollUtils.java

@@ -52,8 +52,8 @@ public int intDirection() {
         }
     }
 
-    private ScrollUtils() {
-    }
+    private static final double DEFAULT_SPEED = 1.0;
+    private static final double DEFAULT_TRACK_PAD_ADJUSTMENT = 7.0;
 
     /**
      * Determines if the given ScrollEvent comes from a trackpad.
@@ -68,16 +68,10 @@ private ScrollUtils() {
      * @see ScrollEvent#getDeltaY()
      */
     public static boolean isTrackPad(ScrollEvent event, ScrollDirection scrollDirection) {
-        switch (scrollDirection) {
-            case UP:
-            case DOWN:
-                return Math.abs(event.getDeltaY()) < 10;
-            case LEFT:
-            case RIGHT:
-                return Math.abs(event.getDeltaX()) < 10;
-            default:
-                return false;
-        }
+        return switch (scrollDirection) {
+            case UP, DOWN -> Math.abs(event.getDeltaY()) < 10;
+            case LEFT, RIGHT -> Math.abs(event.getDeltaX()) < 10;
+        };
     }
 
     /**
@@ -117,7 +111,7 @@ public static ScrollDirection determineScrollDirection(ScrollEvent event) {
      * default speed value of 1.
      */
     public static void addSmoothScrolling(ScrollPane scrollPane) {
-        addSmoothScrolling(scrollPane, 1);
+        addSmoothScrolling(scrollPane, DEFAULT_SPEED);
     }
 
     /**
@@ -126,7 +120,7 @@ public static void addSmoothScrolling(ScrollPane scrollPane) {
      * with a default trackPadAdjustment of 7.
      */
     public static void addSmoothScrolling(ScrollPane scrollPane, double speed) {
-        addSmoothScrolling(scrollPane, speed, 7);
+        addSmoothScrolling(scrollPane, speed, DEFAULT_TRACK_PAD_ADJUSTMENT);
     }
 
     /**
@@ -143,12 +137,12 @@ public static void addSmoothScrolling(ScrollPane scrollPane, double speed, doubl
 
     /// @author Glavo
     public static void addSmoothScrolling(VirtualFlow<?> virtualFlow) {
-        addSmoothScrolling(virtualFlow, 1);
+        addSmoothScrolling(virtualFlow, DEFAULT_SPEED);
     }
 
     /// @author Glavo
     public static void addSmoothScrolling(VirtualFlow<?> virtualFlow, double speed) {
-        addSmoothScrolling(virtualFlow, speed, 7);
+        addSmoothScrolling(virtualFlow, speed, DEFAULT_TRACK_PAD_ADJUSTMENT);
     }
 
     /// @author Glavo
@@ -180,16 +174,16 @@ private static void smoothScroll(ScrollPane scrollPane, double speed, double tra
             }
         };
         if (scrollPane.getContent().getParent() != null) {
-            scrollPane.getContent().getParent().addEventHandler(MouseEvent.MOUSE_PRESSED, mouseHandler);
+            scrollPane.getContent().getParent().addEventFilter(MouseEvent.MOUSE_PRESSED, mouseHandler);
             scrollPane.getContent().getParent().addEventHandler(ScrollEvent.ANY, scrollHandler);
         }
         scrollPane.getContent().parentProperty().addListener((observable, oldValue, newValue) -> {
             if (oldValue != null) {
-                oldValue.removeEventHandler(MouseEvent.MOUSE_PRESSED, mouseHandler);
+                oldValue.removeEventFilter(MouseEvent.MOUSE_PRESSED, mouseHandler);
                 oldValue.removeEventHandler(ScrollEvent.ANY, scrollHandler);
             }
             if (newValue != null) {
-                newValue.addEventHandler(MouseEvent.MOUSE_PRESSED, mouseHandler);
+                newValue.addEventFilter(MouseEvent.MOUSE_PRESSED, mouseHandler);
                 newValue.addEventHandler(ScrollEvent.ANY, scrollHandler);
             }
         });
@@ -250,7 +244,7 @@ private static void smoothScroll(VirtualFlow<?> virtualFlow, double speed, doubl
                 event.consume();
             }
         };
-        virtualFlow.addEventHandler(MouseEvent.MOUSE_PRESSED, mouseHandler);
+        virtualFlow.addEventFilter(MouseEvent.MOUSE_PRESSED, mouseHandler);
         virtualFlow.addEventFilter(ScrollEvent.ANY, scrollHandler);
 
         timeline.getKeyFrames().add(new KeyFrame(DURATION, event -> {
@@ -278,4 +272,7 @@ private static void smoothScroll(VirtualFlow<?> virtualFlow, double speed, doubl
         }));
         timeline.setCycleCount(Animation.INDEFINITE);
     }
+
+    private ScrollUtils() {
+    }
 }