diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java index db1e44968..60d8608b5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/FXUtils.java @@ -299,6 +299,14 @@ public final class FXUtils { }); } + public static Node wrap(Node node) { + return limitingSize(node, 30, 20); + } + + public static Node wrap(SVG svg) { + return wrap(svg.createIcon(20)); + } + private static class ListenerPair { private final ObservableValue value; private final ChangeListener listener; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java index b1fbbdbdc..bb0210a37 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListPage.java @@ -54,7 +54,7 @@ import org.jackhuang.hmcl.util.javafx.MappedObservableList; import java.util.Locale; import static org.jackhuang.hmcl.setting.ConfigHolder.globalConfig; -import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap; +import static org.jackhuang.hmcl.ui.FXUtils.wrap; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import static org.jackhuang.hmcl.util.javafx.ExtendedProperties.createSelectedItemPropertyFor; import static org.jackhuang.hmcl.util.logging.Logger.LOG; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListBox.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListBox.java index 400dd56ad..3a8249bc4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListBox.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/construct/AdvancedListBox.java @@ -30,7 +30,6 @@ import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; import org.jackhuang.hmcl.ui.animation.ContainerAnimations; import org.jackhuang.hmcl.ui.animation.TransitionPane; -import org.jackhuang.hmcl.ui.versions.VersionPage; import java.util.function.Consumer; @@ -75,7 +74,7 @@ public class AdvancedListBox extends ScrollPane { item.setActionButtonVisible(false); item.setTitle(title); if (leftGraphic != null) { - item.setLeftGraphic(VersionPage.wrap(leftGraphic)); + item.setLeftGraphic(FXUtils.wrap(leftGraphic)); } return item; } 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 445f67bcc..b37952862 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 @@ -67,7 +67,7 @@ import java.util.Locale; import java.util.stream.Collectors; import static org.jackhuang.hmcl.ui.FXUtils.runInFX; -import static org.jackhuang.hmcl.ui.versions.VersionPage.wrap; +import static org.jackhuang.hmcl.ui.FXUtils.wrap; import static org.jackhuang.hmcl.util.i18n.I18n.i18n; import static org.jackhuang.hmcl.util.logging.Logger.LOG; diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java index 2366242f4..de09d619c 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/profile/ProfileListItemSkin.java @@ -28,7 +28,6 @@ import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; import org.jackhuang.hmcl.ui.construct.RipplerContainer; import org.jackhuang.hmcl.ui.construct.TwoLineListItem; -import org.jackhuang.hmcl.ui.versions.VersionPage; public class ProfileListItemSkin extends SkinBase { private final PseudoClass SELECTED = PseudoClass.getPseudoClass("selected"); @@ -47,7 +46,7 @@ public class ProfileListItemSkin extends SkinBase { FXUtils.onClicked(getSkinnable(), () -> getSkinnable().setSelected(true)); - Node left = VersionPage.wrap(SVG.FOLDER); + Node left = FXUtils.wrap(SVG.FOLDER); root.setLeft(left); BorderPane.setAlignment(left, Pos.CENTER_LEFT); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListPage.java index 20829ca17..6b1673bef 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameListPage.java @@ -70,7 +70,7 @@ public class GameListPage extends DecoratorAnimatedPage implements DecoratorPage addProfileItem.getStyleClass().add("navigation-drawer-item"); addProfileItem.setTitle(i18n("profile.new")); addProfileItem.setActionButtonVisible(false); - addProfileItem.setLeftGraphic(VersionPage.wrap(SVG.ADD_CIRCLE)); + addProfileItem.setLeftGraphic(FXUtils.wrap(SVG.ADD_CIRCLE)); addProfileItem.setOnAction(e -> Controllers.navigate(new ProfilePage(null))); pane.setFitToWidth(true); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java index 82261030f..7ea91bacb 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/VersionPage.java @@ -21,11 +21,8 @@ import com.jfoenix.controls.JFXPopup; import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.property.*; -import javafx.geometry.Insets; -import javafx.geometry.Pos; import javafx.scene.Node; import javafx.scene.layout.Priority; -import javafx.scene.layout.StackPane; import javafx.scene.layout.VBox; import org.jackhuang.hmcl.event.EventBus; import org.jackhuang.hmcl.event.EventPriority; @@ -305,20 +302,6 @@ public class VersionPage extends DecoratorAnimatedPage implements DecoratorPage } } - public static Node wrap(Node node) { - StackPane stackPane = new StackPane(); - stackPane.setAlignment(Pos.CENTER); - FXUtils.setLimitWidth(stackPane, 30); - FXUtils.setLimitHeight(stackPane, 20); - stackPane.setPadding(new Insets(0, 0, 0, 0)); - stackPane.getChildren().setAll(node); - return stackPane; - } - - public static Node wrap(SVG svg) { - return wrap(svg.createIcon(20)); - } - public interface VersionLoadable { void loadVersion(Profile profile, String version); }