From 1f7d3591b9d40d1f07c0ddd463a14f61233ef3ee Mon Sep 17 00:00:00 2001 From: Lenni0451 Date: Mon, 28 Oct 2019 20:36:59 +0100 Subject: [PATCH] Revert "Increased window size by 20 to prevent sideways scrollbars to show up" This reverts commit 4e537de894ec2e68c1e948ea5474de2dcfecee08. --- HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java | 2 +- HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java | 2 +- HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java | 2 +- HMCL/src/main/java/org/jackhuang/hmcl/ui/WebStage.java | 2 +- .../org/jackhuang/hmcl/ui/decorator/DecoratorController.java | 2 +- .../java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java index 56e2a4d9b..3d9a379c1 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/Controllers.java @@ -210,7 +210,7 @@ public final class Controllers { Task.runAsync(JavaVersion::initialize).start(); - scene = new Scene(decorator.getDecorator(), 820, 519); + scene = new Scene(decorator.getDecorator(), 800, 519); scene.getStylesheets().setAll(config().getTheme().getStylesheets()); stage.getIcons().add(newImage("/assets/img/icon.png")); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java index 23a72ed04..9376c5211 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/CrashWindow.java @@ -65,7 +65,7 @@ public class CrashWindow extends Stage { pane.setCenter(textArea); pane.setBottom(box); - Scene scene = new Scene(pane, 820, 480); + Scene scene = new Scene(pane, 800, 480); setScene(scene); getIcons().add(newImage("/assets/img/icon.png")); setTitle(i18n("message.error")); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java index c0901ae93..8a323c8f5 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/LogWindow.java @@ -65,7 +65,7 @@ public final class LogWindow extends Stage { public final EventManager onDone = new EventManager<>(); public LogWindow() { - setScene(new Scene(impl, 820, 480)); + setScene(new Scene(impl, 800, 480)); getScene().getStylesheets().addAll(config().getTheme().getStylesheets()); setTitle(i18n("logwindow.title")); getIcons().add(newImage("/assets/img/icon.png")); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/WebStage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/WebStage.java index 3def688c1..581e65d53 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/WebStage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/WebStage.java @@ -28,7 +28,7 @@ public class WebStage extends Stage { private final WebView webView = new WebView(); public WebStage() { - setScene(new Scene(webView, 820, 480)); + setScene(new Scene(webView, 800, 480)); getScene().getStylesheets().addAll(config().getTheme().getStylesheets()); getIcons().add(newImage("/assets/img/icon.png")); } 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 b5d362967..63ac00588 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 @@ -150,7 +150,7 @@ public class DecoratorController { if (image == null) { image = loadDefaultBackgroundImage(); } - return new Background(new BackgroundImage(image, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(820, 480, false, false, true, true))); + return new Background(new BackgroundImage(image, BackgroundRepeat.NO_REPEAT, BackgroundRepeat.NO_REPEAT, BackgroundPosition.DEFAULT, new BackgroundSize(800, 480, false, false, true, true))); }, config().backgroundImageTypeProperty(), config().backgroundImageProperty())); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java index 4282c5678..a13db398b 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java @@ -73,7 +73,7 @@ public class DecoratorSkin extends SkinBase { BorderPane root = new BorderPane(); root.getStyleClass().addAll("jfx-decorator", "resize-border"); root.setPrefHeight(519); - root.setPrefWidth(820); + root.setPrefWidth(800); root.setMaxHeight(Region.USE_PREF_SIZE); root.setMinHeight(Region.USE_PREF_SIZE); root.setMaxWidth(Region.USE_PREF_SIZE);