From 5991adb6bff5cc0b96bfbe398947cd48fe7b98f3 Mon Sep 17 00:00:00 2001 From: ToobLac Date: Thu, 6 Aug 2026 20:10:07 +0800 Subject: [PATCH 1/3] update --- .../org/jackhuang/hmcl/ui/instances/ModListPageSkin.java | 2 -- .../jackhuang/hmcl/ui/instances/ResourcePackListPage.java | 2 -- HMCL/src/main/resources/assets/css/root.css | 6 +----- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPageSkin.java index 154705397d1..d18d1f91e1a 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPageSkin.java @@ -558,8 +558,6 @@ final class ModInfoListCell extends MDListCell { ModInfoListCell(JFXListView listView) { super(listView); - this.getStyleClass().add("mod-info-list-cell"); - HBox container = new HBox(8); container.setPickOnBounds(false); container.setAlignment(Pos.CENTER_LEFT); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ResourcePackListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ResourcePackListPage.java index f98fa0fc46e..ddd6da39d18 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ResourcePackListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ResourcePackListPage.java @@ -511,8 +511,6 @@ public ResourcePackListCell(JFXListView listView, Resour super(listView); this.page = page; - getStyleClass().add("resource-pack-list-cell"); - HBox root = new HBox(8); root.setPickOnBounds(false); root.setAlignment(Pos.CENTER_LEFT); diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 6b1cf2c8920..686516f1a77 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -1105,11 +1105,7 @@ -fx-background-color: -monet-secondary-container; } -.mod-info-list-cell:warning { - -fx-background-color: -monet-error-container; -} - -.resource-pack-list-cell:warning { +.md-list-cell:warning { -fx-background-color: -monet-error-container; } From 43c3a06c5c31332175f73f92da6825114972a65e Mon Sep 17 00:00:00 2001 From: ToobLac Date: Thu, 6 Aug 2026 20:13:05 +0800 Subject: [PATCH 2/3] update --- .../main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java | 1 + .../java/org/jackhuang/hmcl/ui/instances/ModListPageSkin.java | 2 -- .../org/jackhuang/hmcl/ui/instances/ResourcePackListPage.java | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java index bf62346f034..1e5fa013cb8 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java @@ -27,6 +27,7 @@ public abstract class MDListCell extends ListCell { private static final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected"); + protected static final PseudoClass WARNING = PseudoClass.getPseudoClass("warning"); private final StackPane container = new StackPane(); private final StackPane root = new StackPane(); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPageSkin.java index d18d1f91e1a..44bac68692e 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ModListPageSkin.java @@ -26,7 +26,6 @@ import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleBooleanProperty; import javafx.collections.ListChangeListener; -import javafx.css.PseudoClass; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.Node; @@ -543,7 +542,6 @@ final class ModInfoDialog extends JFXDialogLayout { private static final Lazy popup = new Lazy<>(() -> new JFXPopup(menu.get())); final class ModInfoListCell extends MDListCell { - private static final PseudoClass WARNING = PseudoClass.getPseudoClass("warning"); JFXCheckBox checkBox = new JFXCheckBox(); ImageContainer imageContainer = new ImageContainer(32); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ResourcePackListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ResourcePackListPage.java index ddd6da39d18..e79be31362f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ResourcePackListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/instances/ResourcePackListPage.java @@ -23,7 +23,6 @@ import javafx.beans.binding.Bindings; import javafx.beans.property.BooleanProperty; import javafx.beans.property.SimpleBooleanProperty; -import javafx.css.PseudoClass; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.Node; @@ -493,7 +492,6 @@ Image getIcon() { } private static final class ResourcePackListCell extends MDListCell { - private static final PseudoClass WARNING = PseudoClass.getPseudoClass("warning"); private final ResourcePackListPage page; From bfcf3235e64458f7281f4f58d1d5ed9d48375b07 Mon Sep 17 00:00:00 2001 From: ToobLac Date: Thu, 6 Aug 2026 21:01:35 +0800 Subject: [PATCH 3/3] update --- .../java/org/jackhuang/hmcl/ui/construct/MDListCell.java | 7 +++---- HMCL/src/main/resources/assets/css/root.css | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java index 1e5fa013cb8..9efe8aed6c6 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MDListCell.java @@ -33,11 +33,12 @@ public abstract class MDListCell extends ListCell { private final StackPane root = new StackPane(); public MDListCell(JFXListView listView) { + getStyleClass().add("md-list-cell"); setText(null); setGraphic(null); - root.getStyleClass().add("md-list-cell"); + root.getStyleClass().add("root-container"); RipplerContainer ripplerContainer = new RipplerContainer(container); root.getChildren().setAll(ripplerContainer); @@ -74,9 +75,7 @@ protected StackPane getContainer() { } protected void setSelectable() { - FXUtils.onChangeAndOperate(selectedProperty(), selected -> { - root.pseudoClassStateChanged(SELECTED, selected); - }); + FXUtils.onChangeAndOperate(selectedProperty(), selected -> pseudoClassStateChanged(SELECTED, selected)); } protected abstract void updateControl(T item, boolean empty); diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 686516f1a77..3cf4169d6ca 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -1096,16 +1096,16 @@ -fx-spacing: 10; } -.md-list-cell { +.md-list-cell .root-container { -fx-border-color: -monet-outline-variant; -fx-border-width: 0 0 1 0; } -.md-list-cell:selected { +.md-list-cell:selected .root-container { -fx-background-color: -monet-secondary-container; } -.md-list-cell:warning { +.md-list-cell:warning .root-container { -fx-background-color: -monet-error-container; }