From 23a5d30aaddcc8269408f22992a7fb6d07b14f18 Mon Sep 17 00:00:00 2001
From: SaltWood_233 <105980161+SALTWOOD@users.noreply.github.com>
Date: Sun, 31 May 2026 20:03:20 +0800
Subject: [PATCH 1/4] fix(#6154): fix by replacing `NaN` with a placeholder
 value

---
 .../java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
index bb42af077a..3409d9eb37 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
@@ -180,7 +180,7 @@ public ObservableList<Label> getTags() {
                     () -> {
                         if (tags.isEmpty()) return 0.0;
                         double h = tagsBox.prefHeight(-1);
-                        return h > 0 ? h : Double.NaN;
+                        return h > 0 ? h : 24.0;
                     },
                     tags, tagsBox.heightProperty()
             );

From afff1f37b0c384b1415e53af125940be9a2f6a27 Mon Sep 17 00:00:00 2001
From: SaltWood_233 <105980161+SALTWOOD@users.noreply.github.com>
Date: Sun, 31 May 2026 20:17:30 +0800
Subject: [PATCH 2/4] fix(ui): remove ScrollPane from tag container to
 eliminate layout race (#6154)

---
 .../hmcl/ui/construct/TwoLineListItem.java    | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
index 3409d9eb37..dcb6c7f061 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
@@ -17,7 +17,6 @@
  */
 package org.jackhuang.hmcl.ui.construct;
 
-import javafx.beans.InvalidationListener;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.StringProperty;
 import javafx.beans.property.StringPropertyBase;
@@ -26,7 +25,6 @@
 import javafx.css.PseudoClass;
 import javafx.geometry.Pos;
 import javafx.scene.control.Label;
-import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
@@ -168,29 +166,13 @@ public ObservableList<Label> getTags() {
             var tagsBox = new HBox(8);
             tagsBox.getStyleClass().add("tags");
             tagsBox.setAlignment(Pos.CENTER_LEFT);
+            HBox.setHgrow(tagsBox, Priority.ALWAYS);
             Bindings.bindContent(tagsBox.getChildren(), tags);
+            tagsBox.managedProperty().bind(Bindings.isNotEmpty(tags));
+            tagsBox.visibleProperty().bind(Bindings.isNotEmpty(tags));
 
-            var scrollPane = new ScrollPane(tagsBox);
-            scrollPane.setMinSize(0, 0);
-            HBox.setHgrow(scrollPane, Priority.ALWAYS);
             lblTitle.setMinWidth(Label.USE_PREF_SIZE);
-            scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-            scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
-            var expectedHeight = Bindings.createDoubleBinding(
-                    () -> {
-                        if (tags.isEmpty()) return 0.0;
-                        double h = tagsBox.prefHeight(-1);
-                        return h > 0 ? h : 24.0;
-                    },
-                    tags, tagsBox.heightProperty()
-            );
-
-            scrollPane.minHeightProperty().bind(expectedHeight);
-            scrollPane.prefHeightProperty().bind(expectedHeight);
-            scrollPane.maxHeightProperty().bind(expectedHeight);
-            firstLine.getChildren().setAll(lblTitle, scrollPane);
-
-            tags.addListener((InvalidationListener) ignored -> scrollPane.requestLayout());
+            firstLine.getChildren().setAll(lblTitle, tagsBox);
         }
         return tags;
     }

From fe0c4bd0fca94c51279d19036c270061d9a5d64f Mon Sep 17 00:00:00 2001
From: SaltWood_233 <105980161+SALTWOOD@users.noreply.github.com>
Date: Mon, 1 Jun 2026 21:33:52 +0900
Subject: [PATCH 3/4] Update
 HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 .../org/jackhuang/hmcl/ui/construct/TwoLineListItem.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
index dcb6c7f061..5a1bb37004 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
@@ -168,8 +168,9 @@ public ObservableList<Label> getTags() {
             tagsBox.setAlignment(Pos.CENTER_LEFT);
             HBox.setHgrow(tagsBox, Priority.ALWAYS);
             Bindings.bindContent(tagsBox.getChildren(), tags);
-            tagsBox.managedProperty().bind(Bindings.isNotEmpty(tags));
-            tagsBox.visibleProperty().bind(Bindings.isNotEmpty(tags));
+            var isNotEmpty = Bindings.isNotEmpty(tags);
+            tagsBox.managedProperty().bind(isNotEmpty);
+            tagsBox.visibleProperty().bind(isNotEmpty);
 
             lblTitle.setMinWidth(Label.USE_PREF_SIZE);
             firstLine.getChildren().setAll(lblTitle, tagsBox);

From 1b2b7fdb54418f5d7f0df470a9645aa679d82f16 Mon Sep 17 00:00:00 2001
From: SaltWood_233 <105980161+SALTWOOD@users.noreply.github.com>
Date: Mon, 1 Jun 2026 23:51:45 +0800
Subject: [PATCH 4/4] fix(ui): squashed tags

---
 .../org/jackhuang/hmcl/ui/construct/TwoLineListItem.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
index 5a1bb37004..1b6306ebc4 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/TwoLineListItem.java
@@ -28,6 +28,7 @@
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
+import javafx.scene.shape.Rectangle;
 
 public class TwoLineListItem extends VBox {
     private static final String DEFAULT_STYLE_CLASS = "two-line-list-item";
@@ -172,6 +173,12 @@ public ObservableList<Label> getTags() {
             tagsBox.managedProperty().bind(isNotEmpty);
             tagsBox.visibleProperty().bind(isNotEmpty);
 
+            // Clip overflow tags, matching the previous ScrollPane behavior.
+            var clip = new Rectangle();
+            tagsBox.setClip(clip);
+            tagsBox.widthProperty().addListener((obs, old, val) -> clip.setWidth(val.doubleValue()));
+            tagsBox.heightProperty().addListener((obs, old, val) -> clip.setHeight(val.doubleValue()));
+
             lblTitle.setMinWidth(Label.USE_PREF_SIZE);
             firstLine.getChildren().setAll(lblTitle, tagsBox);
         }
@@ -181,6 +188,7 @@ public ObservableList<Label> getTags() {
     public void addTag(String tag, PseudoClass pseudoClass) {
         var tagLabel = new Label(tag);
         tagLabel.getStyleClass().add("tag");
+        tagLabel.setMinWidth(Label.USE_PREF_SIZE);
         if (pseudoClass != null)
             tagLabel.pseudoClassStateChanged(pseudoClass, true);
         getTags().add(tagLabel);