lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Glavo
2025-11-25 15:55:12 +08:00
committed by GitHub
parent 4a3d330f12
commit 6ca6429114
1 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
HMCL/src/main/java/org/jackhuang/hmcl/ui/ScrollUtils.java
View File

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