From b1952a7b37184d0c82ce4c98af4f7e3174a48db5 Mon Sep 17 00:00:00 2001
From: huanghongxun <i@huangyuhui.net>
Date: Sat, 3 Sep 2022 22:26:05 +0800
Subject: [PATCH] fix(ui): not wrapping text. Closes #1673.

---
 .../hmcl/ui/construct/MultiFileItem.java      | 19 ++++++-------------
 .../assets/fxml/download/modpack.fxml         | 10 +++++-----
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiFileItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiFileItem.java
index a4a0c0b37..42fd95480 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiFileItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/MultiFileItem.java
@@ -165,19 +165,12 @@ public class MultiFileItem<T> extends VBox {
             pane.setLeft(left);
 
             if (StringUtils.isNotBlank(subtitle)) {
-                Optional<String> shortSubtitle = StringUtils.truncate(subtitle);
-                Label right;
-                if (shortSubtitle.isPresent()) {
-                    right = new Label(shortSubtitle.get());
-                    right.setTooltip(new Tooltip(subtitle));
-                } else {
-                    right = new Label(subtitle);
-                }
-                BorderPane.setAlignment(right, Pos.CENTER_RIGHT);
-                right.setWrapText(true);
-                right.getStyleClass().add("subtitle-label");
-                right.setStyle("-fx-font-size: 10;");
-                pane.setRight(right);
+                Label center = new Label(subtitle);
+                BorderPane.setAlignment(center, Pos.CENTER_RIGHT);
+                center.setWrapText(true);
+                center.getStyleClass().add("subtitle-label");
+                center.setStyle("-fx-font-size: 10;");
+                pane.setCenter(center);
             }
 
             return pane;
diff --git a/HMCL/src/main/resources/assets/fxml/download/modpack.fxml b/HMCL/src/main/resources/assets/fxml/download/modpack.fxml
index bc94b28e2..1f14a18fa 100644
--- a/HMCL/src/main/resources/assets/fxml/download/modpack.fxml
+++ b/HMCL/src/main/resources/assets/fxml/download/modpack.fxml
@@ -17,12 +17,12 @@
     <SpinnerPane fx:id="spinnerPane" styleClass="large-spinner-pane">
         <VBox fx:id="borderPane" alignment="CENTER" FXUtils.limitWidth="500">
             <ComponentList>
-                <BorderPane><left><Label text="%modpack.task.install.will" /></left><right><Label fx:id="lblModpackLocation" /></right></BorderPane>
-                <BorderPane><left><Label BorderPane.alignment="CENTER_LEFT" text="%archive.name" /></left><right><JFXTextField fx:id="txtModpackName" StackPane.margin="$insets" /></right></BorderPane>
+                <BorderPane><left><Label text="%modpack.task.install.will" /></left><center><Label BorderPane.alignment="CENTER_RIGHT" fx:id="lblModpackLocation" /></center></BorderPane>
+                <BorderPane><left><Label BorderPane.alignment="CENTER_LEFT" text="%archive.name" /></left><center><JFXTextField BorderPane.alignment="CENTER_RIGHT" fx:id="txtModpackName" StackPane.margin="$insets" /></center></BorderPane>
 
-                <BorderPane><left><Label text="%modpack.name"/></left><right><Label fx:id="lblName" /></right></BorderPane>
-                <BorderPane><left><Label text="%archive.version"/></left><right><Label fx:id="lblVersion" /></right></BorderPane>
-                <BorderPane><left><Label text="%archive.author"/></left><right><Label fx:id="lblAuthor" /></right></BorderPane>
+                <BorderPane><left><Label text="%modpack.name"/></left><center><Label BorderPane.alignment="CENTER_RIGHT" fx:id="lblName" /></center></BorderPane>
+                <BorderPane><left><Label text="%archive.version"/></left><center><Label BorderPane.alignment="CENTER_RIGHT" fx:id="lblVersion" /></center></BorderPane>
+                <BorderPane><left><Label text="%archive.author"/></left><center><Label BorderPane.alignment="CENTER_RIGHT" fx:id="lblAuthor" /></center></BorderPane>
                 <BorderPane>
                     <left><JFXButton fx:id="btnDescription" onMouseClicked="#onDescribe" text="%modpack.description" styleClass="jfx-button-border" /></left>
                     <right><JFXButton buttonType="RAISED" fx:id="btnInstall" onMouseClicked="#onInstall" text="%button.install" styleClass="jfx-button-raised" /></right>