更新 ToolbarListPageSkin 以使用 JFXListView 展示节点

Author: Glavo

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

@@ -18,24 +18,26 @@
 package org.jackhuang.hmcl.ui;
 
 import com.jfoenix.controls.JFXButton;
+import com.jfoenix.controls.JFXListView;
 import javafx.beans.binding.Bindings;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
-import javafx.scene.control.ScrollPane;
+import javafx.scene.control.ListCell;
 import javafx.scene.control.SkinBase;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.StackPane;
-import javafx.scene.layout.VBox;
 import org.jackhuang.hmcl.ui.construct.ComponentList;
 import org.jackhuang.hmcl.ui.construct.SpinnerPane;
 
 import java.util.List;
 
-public abstract class ToolbarListPageSkin<T extends ListPageBase<? extends Node>> extends SkinBase<T> {
+public abstract class ToolbarListPageSkin<E, P extends ListPageBase<E>> extends SkinBase<P> {
 
-    public ToolbarListPageSkin(T skinnable) {
+    protected final JFXListView<E> listView;
+
+    public ToolbarListPageSkin(P skinnable) {
         super(skinnable);
 
         SpinnerPane spinnerPane = new SpinnerPane();
@@ -58,18 +60,24 @@ public ToolbarListPageSkin(T skinnable) {
         }
 
         {
-            ScrollPane scrollPane = new ScrollPane();
-            ComponentList.setVgrow(scrollPane, Priority.ALWAYS);
-            scrollPane.setFitToWidth(true);
-
-            VBox content = new VBox();
-
-            Bindings.bindContent(content.getChildren(), skinnable.itemsProperty());
-
-            scrollPane.setContent(content);
-            FXUtils.smoothScrolling(scrollPane);
-
-            root.getContent().add(scrollPane);
+            this.listView = new JFXListView<>();
+            this.listView.setPadding(Insets.EMPTY);
+            this.listView.setCellFactory(listView -> new ListCell<>() {
+                @Override
+                protected void updateItem(E item, boolean empty) {
+                    super.updateItem(item, empty);
+                    if (!empty && item instanceof Node node) {
+                        setGraphic(node);
+                        setText(null);
+                    } else {
+                        setGraphic(null);
+                        setText(null);
+                    }
+                }
+            });
+            ComponentList.setVgrow(listView, Priority.ALWAYS);
+            Bindings.bindContent(this.listView.getItems(), skinnable.itemsProperty());
+            root.getContent().add(listView);
         }
 
         spinnerPane.setContent(root);
@@ -102,5 +110,5 @@ public static JFXButton createDecoratorButton(String tooltip, SVG svg, Runnable
         return ret;
     }
 
-    protected abstract List<Node> initializeToolbar(T skinnable);
+    protected abstract List<Node> initializeToolbar(P skinnable);
 }

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

@@ -295,7 +295,7 @@ private static final class JavaRuntimeItemSkin extends SkinBase<JavaItem> {
         }
     }
 
-    private static final class JavaPageSkin extends ToolbarListPageSkin2<JavaManagementPage.JavaItem, JavaManagementPage> {
+    private static final class JavaPageSkin extends ToolbarListPageSkin<JavaItem, JavaManagementPage> {
 
         JavaPageSkin(JavaManagementPage skinnable) {
             super(skinnable);

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

@@ -192,7 +192,7 @@ private static final class DisabledJavaItemSkin extends SkinBase<DisabledJavaIte
         }
     }
 
-    private static final class JavaRestorePageSkin extends ToolbarListPageSkin<JavaRestorePage> {
+    private static final class JavaRestorePageSkin extends ToolbarListPageSkin<DisabledJavaItem, JavaRestorePage> {
         JavaRestorePageSkin(JavaRestorePage skinnable) {
             super(skinnable);
         }

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

@@ -154,7 +154,7 @@ protected GameListSkin createDefaultSkin() {
             return new GameListSkin();
         }
 
-        private class GameListSkin extends ToolbarListPageSkin2<GameListItem, GameList> {
+        private class GameListSkin extends ToolbarListPageSkin<GameListItem, GameList> {
 
             public GameListSkin() {
                 super(GameList.this);

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

@@ -165,7 +165,7 @@ public void onStop(boolean success, TaskExecutor executor) {
         executor.start();
     }
 
-    private class InstallerListPageSkin extends ToolbarListPageSkin<InstallerListPage> {
+    private class InstallerListPageSkin extends ToolbarListPageSkin<InstallerItem, InstallerListPage> {
 
         InstallerListPageSkin() {
             super(InstallerListPage.this);

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

@@ -599,7 +599,7 @@ public ItemSkin(Item item) {
         }
     }
 
-    private final class SchematicsPageSkin extends ToolbarListPageSkin<SchematicsPage> {
+    private final class SchematicsPageSkin extends ToolbarListPageSkin<Item, SchematicsPage> {
         SchematicsPageSkin() {
             super(SchematicsPage.this);
         }

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

@@ -155,7 +155,7 @@ void createBackup() {
         }), i18n("world.backup"), null);
     }
 
-    private final class WorldBackupsPageSkin extends ToolbarListPageSkin<WorldBackupsPage> {
+    private final class WorldBackupsPageSkin extends ToolbarListPageSkin<BackupInfo, WorldBackupsPage> {
 
         WorldBackupsPageSkin() {
             super(WorldBackupsPage.this);

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

@@ -21,6 +21,7 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.Node;
+import javafx.scene.control.Skin;
 import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.game.World;
 import org.jackhuang.hmcl.setting.Profile;
@@ -67,7 +68,7 @@ public WorldListPage() {
     }
 
     @Override
-    protected ToolbarListPageSkin<WorldListPage> createDefaultSkin() {
+    protected Skin<WorldListPage> createDefaultSkin() {
         return new WorldListPageSkin();
     }
 
@@ -161,7 +162,7 @@ public void setShowAll(boolean showAll) {
         this.showAll.set(showAll);
     }
 
-    private final class WorldListPageSkin extends ToolbarListPageSkin<WorldListPage> {
+    private final class WorldListPageSkin extends ToolbarListPageSkin<WorldListItem, WorldListPage> {
 
         WorldListPageSkin() {
             super(WorldListPage.this);