From 5ed42d165414c09aa2f041813fde41ac24076c26 Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Tue, 7 Apr 2020 11:46:00 +0800 Subject: [PATCH] alt: remove background of some pages --- .../java/org/jackhuang/hmcl/ui/ListPageSkin.java | 1 - .../hmcl/ui/decorator/DecoratorController.java | 1 - .../org/jackhuang/hmcl/ui/main/RootPage.java | 4 +--- .../org/jackhuang/hmcl/ui/main/SettingsPage.java | 1 - .../org/jackhuang/hmcl/ui/versions/GameList.java | 1 - .../jackhuang/hmcl/ui/versions/VersionPage.java | 16 +++------------- 6 files changed, 4 insertions(+), 20 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java index e8a4dd0c0..529ee22e8 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/ListPageSkin.java @@ -40,7 +40,6 @@ public class ListPageSkin extends SkinBase> { spinnerPane.getStyleClass().add("large-spinner-pane"); Pane placeholder = new Pane(); VBox list = new VBox(); - spinnerPane.getStyleClass().add("content-background"); StackPane contentPane = new StackPane(); { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java index 4a29b19b3..203b81f1b 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java @@ -80,7 +80,6 @@ public class DecoratorController { decorator.setOnCloseButtonAction(Launcher::stopApplication); navigator = new Navigator(); - navigator.setOnNavigating(this::onNavigating); navigator.setOnNavigated(this::onNavigated); navigator.init(mainPage); 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 445791453..489fa5821 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 @@ -247,9 +247,7 @@ public class RootPage extends DecoratorTabPage { control.transitionPane.getStyleClass().add("jfx-decorator-content-container"); control.transitionPane.getChildren().setAll(getSkinnable().getMainPage()); FXUtils.setOverflowHidden(control.transitionPane, 8); - StackPane wrapper = new StackPane(control.transitionPane); - wrapper.setPadding(new Insets(4)); - root.setCenter(wrapper); + root.setCenter(control.transitionPane); } getChildren().setAll(root); 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 7bdc7e91e..7ac9b7173 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 @@ -73,7 +73,6 @@ public final class SettingsPage extends SettingsView implements DecoratorPage { public SettingsPage() { FXUtils.smoothScrolling(scroll); - addEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onDecoratorPageNavigating); // ==== Download sources ==== cboDownloadSource.getItems().setAll(DownloadProviders.providersById.keySet()); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java index 93451e736..226d51367 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameList.java @@ -57,7 +57,6 @@ public class GameList extends ListPageBase implements DecoratorPag }); Profiles.registerVersionsListener(this::loadVersions); - addEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onDecoratorPageNavigating); } private void loadVersions(Profile profile) { 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 70824ea94..290c62de4 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 @@ -266,18 +266,8 @@ public class VersionPage extends Control implements DecoratorPage { // the root page, with the sidebar in left, navigator in center. BorderPane root = new BorderPane(); - - { - StackPane drawerContainer = new StackPane(); - FXUtils.setLimitWidth(drawerContainer, 200); - drawerContainer.getStyleClass().add("gray-background"); - drawerContainer.getChildren().setAll(control.listView); - FXUtils.setOverflowHidden(drawerContainer, 8); - - StackPane wrapper = new StackPane(drawerContainer); - wrapper.setPadding(new Insets(4, 0, 4, 4)); - root.setLeft(wrapper); - } + FXUtils.setLimitWidth(control.listView, 200); + root.setLeft(control.listView); TabHeader tabPane = new TabHeader(); tabPane.setPickOnBounds(false); @@ -370,7 +360,7 @@ public class VersionPage extends Control implements DecoratorPage { BorderPane titleBar = new BorderPane(); titleBar.setLeft(tabPane); titleBar.setRight(toolBar); - control.state.set(new State(i18n("version.manage.manage"), titleBar, true, false, true)); + control.state.set(new State(i18n("version.manage.manage"), titleBar, true, false, true, false, 200)); control.transitionPane.getStyleClass().add("gray-background"); FXUtils.setOverflowHidden(control.transitionPane, 8);