优化鼠标光标 & 添加按钮等悬停效果

HMCL/src/main/java/com/jfoenix/controls/JFXRippler.java

@@ -30,6 +30,7 @@
 import javafx.css.converter.BooleanConverter;
 import javafx.css.converter.PaintConverter;
 import javafx.css.converter.SizeConverter;
+import javafx.event.EventHandler;
 import javafx.geometry.Bounds;
 import javafx.scene.CacheHint;
 import javafx.scene.Group;
@@ -45,6 +46,8 @@
 import javafx.scene.shape.Rectangle;
 import javafx.scene.shape.Shape;
 import javafx.util.Duration;
+import org.jackhuang.hmcl.ui.animation.AnimationUtils;
+import org.jackhuang.hmcl.ui.animation.Motion;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -76,6 +79,8 @@ public enum RipplerMask {
     protected RippleGenerator rippler;
     protected Pane ripplerPane;
     protected Node control;
+    private Animation coverAnimation;
+    private Rectangle hoverOverlay;
 
     protected static final double RIPPLE_MAX_RADIUS = 300;
     private static final Interpolator RIPPLE_INTERPOLATOR = Interpolator.SPLINE(0.0825,
@@ -128,14 +133,55 @@ public JFXRippler(Node control, RipplerMask mask, RipplerPos pos) {
         setCache(true);
         setCacheHint(CacheHint.SPEED);
         setCacheShape(true);
+
+        EventHandler<MouseEvent> mouseEventHandler;
+        if (AnimationUtils.isAnimationEnabled()) {
+            mouseEventHandler = event -> {
+                if (coverAnimation != null) {
+                    coverAnimation.stop();
+                }
+
+                boolean isEntered = event.getEventType() == MouseEvent.MOUSE_ENTERED;
+                coverAnimation = new Timeline(new KeyFrame(Motion.SHORT4,
+                        new KeyValue(hoverOverlay.opacityProperty(), isEntered ? 1 : 0, isEntered ? Motion.EASE_IN : Motion.EASE_OUT)));
+                coverAnimation.play();
+            };
+        } else {
+            mouseEventHandler = event ->
+                    interpolateBackground(event.getEventType() == MouseEvent.MOUSE_ENTERED ? 1 : 0);
+        }
+
+        addEventHandler(MouseEvent.MOUSE_ENTERED, mouseEventHandler);
+        addEventHandler(MouseEvent.MOUSE_EXITED, mouseEventHandler);
+    }
+
+    private void interpolateBackground(double frac) {
+        if (hoverOverlay == null) return;
+        hoverOverlay.setOpacity(frac);
     }
 
     protected final void createRippleUI() {
         // create rippler panels
         rippler = new RippleGenerator();
         ripplerPane = new StackPane();
         ripplerPane.setMouseTransparent(true);
-        ripplerPane.getChildren().add(rippler);
+
+        hoverOverlay = new Rectangle();
+        hoverOverlay.setManaged(false);
+        hoverOverlay.setCache(true);
+        hoverOverlay.setCacheHint(CacheHint.SPEED);
+        hoverOverlay.setOpacity(0);
+
+        hoverOverlay.fillProperty().bind(Bindings.createObjectBinding(() -> {
+            Paint currentFill = getRipplerFill();
+            if (currentFill instanceof Color fill) {
+                return Color.color(fill.getRed(), fill.getGreen(), fill.getBlue(), 0.15);
+            } else {
+                return currentFill;
+            }
+        }, ripplerFillProperty()));
+
+        ripplerPane.getChildren().addAll(hoverOverlay, rippler);
         getChildren().add(ripplerPane);
     }
 
@@ -561,6 +607,17 @@ private void resetClip() {
     protected void resetRippler() {
         resetOverLay();
         resetClip();
+
+        if (hoverOverlay != null && control != null) {
+            Bounds bounds = control.getBoundsInParent();
+            double diffMinX = Math.abs(control.getBoundsInLocal().getMinX() - control.getLayoutBounds().getMinX());
+            double diffMinY = Math.abs(control.getBoundsInLocal().getMinY() - control.getLayoutBounds().getMinY());
+            hoverOverlay.setX(bounds.getMinX() + diffMinX - snappedLeftInset());
+            hoverOverlay.setY(bounds.getMinY() + diffMinY - snappedTopInset());
+            hoverOverlay.setWidth(control.getLayoutBounds().getWidth());
+            hoverOverlay.setHeight(control.getLayoutBounds().getHeight());
+            hoverOverlay.setClip(getMask());
+        }
     }
 
     /***************************************************************************

HMCL/src/main/java/com/jfoenix/skins/JFXTabPaneSkin.java

@@ -41,7 +41,6 @@
 import javafx.geometry.Insets;
 import javafx.geometry.Side;
 import javafx.geometry.VPos;
-import javafx.scene.Cursor;
 import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.control.skin.TabPaneSkin;
@@ -1126,7 +1125,6 @@ public HeaderControl(ArrowPosition pos) {
             StackPane container = new StackPane(arrowButton);
             container.getStyleClass().add("container");
             container.setPadding(new Insets(7));
-            container.setCursor(Cursor.HAND);
 
             container.setOnMousePressed(press -> {
                 offsetProperty.set(header.scrollOffset);

HMCL/src/main/java/com/jfoenix/skins/JFXToggleButtonSkin.java

@@ -29,7 +29,6 @@
 import com.jfoenix.transitions.JFXKeyValue;
 import javafx.animation.Interpolator;
 import javafx.geometry.Insets;
-import javafx.scene.Cursor;
 import javafx.scene.control.skin.ToggleButtonSkin;
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.Circle;
@@ -86,7 +85,6 @@ public JFXToggleButtonSkin(JFXToggleButton toggleButton) {
 
         final StackPane main = new StackPane();
         main.getChildren().setAll(line, rippler);
-        main.setCursor(Cursor.HAND);
 
         // show focus traversal effect
         getSkinnable().armedProperty().addListener((o, oldVal, newVal) -> {

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

@@ -404,7 +404,6 @@ private static final class InstallerItemSkin extends SkinBase<InstallerItem> {
                             event.consume();
                         }
                     });
-                    pane.setCursor(Cursor.HAND);
                 } else {
                     container.setOnMouseClicked(null);
                     pane.setCursor(Cursor.DEFAULT);

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java

@@ -22,7 +22,6 @@
 import com.jfoenix.effects.JFXDepthManager;
 import javafx.beans.binding.Bindings;
 import javafx.geometry.Pos;
-import javafx.scene.Cursor;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.control.Label;
 import javafx.scene.control.SkinBase;
@@ -52,7 +51,6 @@ public AccountListItemSkin(AccountListItem skinnable) {
         super(skinnable);
 
         BorderPane root = new BorderPane();
-        root.setCursor(Cursor.HAND);
         FXUtils.onClicked(root, skinnable::fire);
 
         JFXRadioButton chkSelected = new JFXRadioButton();

HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/RipplerContainer.java

@@ -18,23 +18,20 @@
 package org.jackhuang.hmcl.ui.construct;
 
 import com.jfoenix.controls.JFXRippler;
-import javafx.animation.Transition;
-import javafx.css.*;
+import javafx.css.CssMetaData;
+import javafx.css.Styleable;
+import javafx.css.StyleableObjectProperty;
+import javafx.css.StyleableProperty;
 import javafx.css.converter.PaintConverter;
-import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.scene.Node;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.BackgroundFill;
 import javafx.scene.layout.CornerRadii;
 import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
-import org.jackhuang.hmcl.theme.Themes;
-import org.jackhuang.hmcl.ui.animation.AnimationUtils;
-import org.jackhuang.hmcl.ui.animation.Motion;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,8 +60,6 @@ protected Node getMask() {
         }
     };
 
-    private Transition coverAnimation;
-
     public RipplerContainer(Node container) {
         this.container = container;
 
@@ -90,61 +85,6 @@ public RipplerContainer(Node container) {
         shape.widthProperty().bind(widthProperty());
         shape.heightProperty().bind(heightProperty());
         setShape(shape);
-
-        EventHandler<MouseEvent> mouseEventHandler;
-        if (AnimationUtils.isAnimationEnabled()) {
-            mouseEventHandler = event -> {
-                if (coverAnimation != null) {
-                    coverAnimation.stop();
-                    coverAnimation = null;
-                }
-
-                if (event.getEventType() == MouseEvent.MOUSE_ENTERED) {
-                    coverAnimation = new Transition() {
-                        {
-                            setCycleDuration(Motion.SHORT4);
-                            setInterpolator(Motion.EASE_IN);
-                        }
-
-                        @Override
-                        protected void interpolate(double frac) {
-                            interpolateBackground(frac);
-                        }
-                    };
-                } else {
-                    coverAnimation = new Transition() {
-                        {
-                            setCycleDuration(Motion.SHORT4);
-                            setInterpolator(Motion.EASE_OUT);
-                        }
-
-                        @Override
-                        protected void interpolate(double frac) {
-                            interpolateBackground(1 - frac);
-                        }
-                    };
-                }
-
-                coverAnimation.play();
-            };
-        } else {
-            mouseEventHandler = event ->
-                    interpolateBackground(event.getEventType() == MouseEvent.MOUSE_ENTERED ? 1 : 0);
-        }
-
-        addEventHandler(MouseEvent.MOUSE_ENTERED, mouseEventHandler);
-        addEventHandler(MouseEvent.MOUSE_EXITED, mouseEventHandler);
-    }
-
-    private void interpolateBackground(double frac) {
-        if (frac < 0.01) {
-            setBackground(null);
-        } else {
-            Color onSurface = Themes.getColorScheme().getOnSurface();
-            setBackground(new Background(new BackgroundFill(
-                    Color.color(onSurface.getRed(), onSurface.getGreen(), onSurface.getBlue(), frac * 0.04),
-                    CornerRadii.EMPTY, Insets.EMPTY)));
-        }
     }
 
     protected void updateChildren() {

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

@@ -28,7 +28,6 @@
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.Cursor;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 import javafx.scene.image.ImageView;
@@ -174,7 +173,6 @@ public final class MainPage extends StackPane implements DecoratorPage {
         FXUtils.setLimitHeight(updatePane, 55);
         StackPane.setAlignment(updatePane, Pos.TOP_RIGHT);
         FXUtils.onClicked(updatePane, this::onUpgrade);
-        updatePane.setCursor(Cursor.HAND);
         FXUtils.onChange(showUpdateProperty(), this::doAnimation);
         FXUtils.onChange(showUpdateDialogProperty(), this::showUpdateDialog);
 

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java

@@ -30,7 +30,6 @@
 import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.Cursor;
 import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
@@ -546,7 +545,6 @@ protected ModDownloadListPageSkin(DownloadListPage control) {
 
                         HBox container = new HBox(8);
                         container.setPadding(new Insets(8));
-                        container.setCursor(Cursor.HAND);
                         container.setAlignment(Pos.CENTER_LEFT);
 
                         imageContainer.setMouseTransparent(true);

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListCell.java

@@ -17,13 +17,14 @@
  */
 package org.jackhuang.hmcl.ui.versions;
 
-import com.jfoenix.controls.*;
+import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXPopup;
+import com.jfoenix.controls.JFXRadioButton;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.event.ActionEvent;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
-import javafx.scene.Cursor;
 import javafx.scene.control.ListCell;
 import javafx.scene.input.MouseButton;
 import javafx.scene.layout.BorderPane;
@@ -141,7 +142,6 @@ public void fire() {
             right.getChildren().add(btnManage);
         }
 
-        root.setCursor(Cursor.HAND);
         container.setOnMouseClicked(e -> {
             GameListItem item = getItem();
             if (item == null)

HMCL/src/main/resources/assets/css/root.css

@@ -392,10 +392,6 @@
     -fx-fill: -monet-inverse-on-surface;
 }
 
-.sponsor-pane {
-    -fx-cursor: hand;
-}
-
 .installer-item-wrapper {
     -fx-background-color: -monet-surface;
     -fx-background-radius: 4;
@@ -444,7 +440,6 @@
     -fx-min-height: 55px;
     -fx-background-color: -monet-primary-container;
     -fx-opacity: 1; /* Override the opacity of disabled button */
-    -fx-cursor: hand;
 }
 
 .launch-pane > .jfx-button.launch-button {
@@ -658,7 +653,6 @@
 .icon {
     -fx-fill: #FE774D;
     -fx-padding: 10.0;
-    -fx-cursor: hand;
 }
 
 /*******************************************************************************
@@ -695,7 +689,6 @@
     -fx-min-height: 40px;
     -fx-max-height: 40px;
     -fx-pref-height: 40px;
-    -fx-cursor: hand;
 }
 
 .jfx-tool-bar .jfx-decorator-button .svg {
@@ -827,16 +820,6 @@
     -fx-background-insets: 0;
 }
 
-/*******************************************************************************
-*                                                                              *
-* JFX Rippler                                                                  *
-*                                                                              *
-*******************************************************************************/
-
-.jfx-rippler:hover {
-    -fx-cursor: hand;
-}
-
 /*******************************************************************************
 *                                                                              *
 * JFX Button                                                                   *
@@ -845,7 +828,6 @@
 
 .jfx-button {
     -jfx-disable-visual-focus: true;
-    -fx-cursor: hand;
 }
 
 .jfx-button .jfx-rippler {
@@ -1541,7 +1523,6 @@
 .combo-box-popup .list-view .jfx-list-cell {
     -fx-background-color: -monet-surface-container;
     -fx-text-fill: -monet-on-surface;
-    -fx-cursor: hand;
     -fx-background-insets: 0.0;
 }