From 4537fe0390be57c521ce0b21cdc8fdfc2607d520 Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Tue, 21 Sep 2021 06:59:10 +0800 Subject: [PATCH] fix: refine UI. Closes #1052. --- .../main/java/org/jackhuang/hmcl/ui/main/RootPage.java | 2 +- .../java/org/jackhuang/hmcl/ui/main/SettingsPage.java | 2 -- .../java/org/jackhuang/hmcl/ui/main/SettingsView.java | 8 +++----- .../org/jackhuang/hmcl/ui/versions/ModListPageSkin.java | 2 ++ HMCL/src/main/resources/assets/css/root.css | 4 ++++ 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java index 90a64b732..72636a652 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/RootPage.java @@ -191,7 +191,7 @@ public class RootPage extends DecoratorTabPage { .add(gameListItem) .add(gameItem) .add(downloadItem) - .startCategory(i18n("settings.launcher.general").toLowerCase()) + .startCategory(i18n("settings.launcher.general").toUpperCase()) .add(multiplayerItem) .add(launcherSettingsItem); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java index 55fa9f9fa..74f44a23c 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsPage.java @@ -99,8 +99,6 @@ public final class SettingsPage extends SettingsView { UpdateChecker.checkingUpdateProperty().addListener(new WeakInvalidationListener(updateListener)); updateListener.invalidated(null); - lblUpdateNote.setWrappingWidth(470); - ToggleGroup updateChannelGroup = new ToggleGroup(); chkUpdateDev.setToggleGroup(updateChannelGroup); chkUpdateDev.setUserData(UpdateChannel.DEVELOPMENT); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java index 93cff9c0d..487ef2d0d 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/main/SettingsView.java @@ -29,6 +29,7 @@ import javafx.scene.control.ScrollPane; import javafx.scene.layout.*; import javafx.scene.text.Text; import javafx.scene.text.TextAlignment; +import javafx.scene.text.TextFlow; import org.jackhuang.hmcl.setting.EnumCommonDirectory; import org.jackhuang.hmcl.setting.Theme; import org.jackhuang.hmcl.ui.FXUtils; @@ -49,7 +50,6 @@ public abstract class SettingsView extends StackPane { protected final MultiFileItem fileCommonLocation; protected final Label lblUpdate; protected final Label lblUpdateSub; - protected final Text lblUpdateNote; protected final JFXRadioButton chkUpdateStable; protected final JFXRadioButton chkUpdateDev; protected final JFXButton btnUpdate; @@ -132,10 +132,8 @@ public abstract class SettingsView extends StackPane { chkUpdateStable = new JFXRadioButton(i18n("update.channel.stable")); chkUpdateDev = new JFXRadioButton(i18n("update.channel.dev")); - VBox noteWrapper = new VBox(); - noteWrapper.setStyle("-fx-padding: 10 0 0 0;"); - lblUpdateNote = new Text(i18n("update.note")); - noteWrapper.getChildren().setAll(lblUpdateNote); + TextFlow noteWrapper = new TextFlow(new Text(i18n("update.note"))); + VBox.setMargin(noteWrapper, new Insets(10, 0, 0, 0)); content.getChildren().setAll(chkUpdateStable, chkUpdateDev, noteWrapper); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java index 13be7811f..889189e46 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java @@ -292,6 +292,8 @@ class ModListPageSkin extends SkinBase { content.setTitle(dataItem.getTitle()); if (dataItem.getMod() != null && I18n.getCurrentLocale().getLocale() == Locale.CHINA) { content.getTags().setAll(dataItem.getMod().getDisplayName()); + } else { + content.getTags().clear(); } content.setSubtitle(dataItem.getSubtitle()); if (booleanProperty != null) { diff --git a/HMCL/src/main/resources/assets/css/root.css b/HMCL/src/main/resources/assets/css/root.css index 6e685d051..a9d39b2dd 100644 --- a/HMCL/src/main/resources/assets/css/root.css +++ b/HMCL/src/main/resources/assets/css/root.css @@ -240,6 +240,10 @@ -fx-font-size: 15px; } +.wrap-text > HBox > .subtitle { + -fx-wrap-text: true; +} + .bubble { -fx-background-color: rgba(0, 0, 0, 0.5); -fx-background-radius: 2px;