[release/3.6] 修复使用 JavaFX 25 时游戏下载界面布局错误的问题 (#4533)

#4508

Author: Glavo

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

@@ -22,6 +22,7 @@
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.value.ChangeListener;
 import javafx.css.PseudoClass;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -312,17 +313,24 @@ public InstallerItem[] getLibraries() {
     private static final class InstallerItemSkin extends SkinBase<InstallerItem> {
         private static final PseudoClass LIST_ITEM = PseudoClass.getPseudoClass("list-item");
         private static final PseudoClass CARD = PseudoClass.getPseudoClass("card");
-        private static final WeakListenerHolder holder = new WeakListenerHolder();
+
+        @SuppressWarnings({"FieldCanBeLocal", "unused"})
+        private final ChangeListener<Number> holder;
 
         InstallerItemSkin(InstallerItem control) {
             super(control);
 
             Pane pane;
             if (control.style == Style.CARD) {
                 pane = new VBox();
-                holder.add(FXUtils.onWeakChange(pane.widthProperty(), v -> FXUtils.setLimitHeight(pane, v.doubleValue() * 0.7)));
+
+                if (FXUtils.JAVAFX_MAJOR_VERSION == 8)
+                    holder = FXUtils.onWeakChange(pane.widthProperty(), v -> FXUtils.setLimitHeight(pane, v.doubleValue() * 0.7));
+                else
+                    holder = FXUtils.onWeakChangeAndOperate(pane.widthProperty(), v -> FXUtils.setLimitHeight(pane, v.doubleValue() * 0.7));
             } else {
                 pane = new HBox();
+                holder = null;
             }
             pane.getStyleClass().add("installer-item");
             RipplerContainer container = new RipplerContainer(pane);

HMCL/src/main/java/org/jackhuang/hmcl/ui/download/AbstractInstallersPage.java

@@ -124,7 +124,7 @@ protected InstallersPageSkin(AbstractInstallersPage control) {
                 libraryPane.setVgap(16);
                 libraryPane.setHgap(16);
 
-                if (libraries.length <= 8) {
+                if (FXUtils.JAVAFX_MAJOR_VERSION < 25 && libraries.length <= 8) {
                     BorderPane.setMargin(libraryPane, new Insets(16, 0, 16, 0));
                     root.setCenter(libraryPane);
                 } else {
@@ -133,6 +133,9 @@ protected InstallersPageSkin(AbstractInstallersPage control) {
                     scrollPane.setFitToHeight(true);
                     BorderPane.setMargin(scrollPane, new Insets(16, 0, 16, 0));
                     root.setCenter(scrollPane);
+
+                    if (libraries.length <= 8)
+                        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
                 }
             }