update

Author: Glavo

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

@@ -17,11 +17,13 @@
  */
 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.ListCell;
 import javafx.scene.control.SkinBase;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
@@ -61,6 +63,19 @@ public ToolbarListPageSkin2(P skinnable) {
         {
             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);
@@ -71,5 +86,30 @@ public ToolbarListPageSkin2(P skinnable) {
         getChildren().setAll(spinnerPane);
     }
 
+    public static Node wrap(Node node) {
+        StackPane stackPane = new StackPane();
+        stackPane.setPadding(new Insets(0, 5, 0, 2));
+        stackPane.getChildren().setAll(node);
+        return stackPane;
+    }
+
+    public static JFXButton createToolbarButton2(String text, SVG svg, Runnable onClick) {
+        JFXButton ret = new JFXButton();
+        ret.getStyleClass().add("jfx-tool-bar-button");
+        ret.setGraphic(wrap(svg.createIcon()));
+        ret.setText(text);
+        ret.setOnAction(e -> onClick.run());
+        return ret;
+    }
+
+    public static JFXButton createDecoratorButton(String tooltip, SVG svg, Runnable onClick) {
+        JFXButton ret = new JFXButton();
+        ret.getStyleClass().add("jfx-decorator-button");
+        ret.setGraphic(wrap(svg.createIcon()));
+        FXUtils.installFastTooltip(ret, tooltip);
+        ret.setOnAction(e -> onClick.run());
+        return ret;
+    }
+
     protected abstract List<Node> initializeToolbar(P skinnable);
 }

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

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