From 6f6efe087439e4b62d1d79f0946c1ac7dbdab6c4 Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Thu, 11 Oct 2018 13:32:39 +0800 Subject: [PATCH] Rename DecoratorControl to Decorator --- .../ui/decorator/{DecoratorControl.java => Decorator.java} | 4 ++-- .../jackhuang/hmcl/ui/decorator/DecoratorController.java | 6 +++--- .../java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) rename HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/{DecoratorControl.java => Decorator.java} (98%) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorControl.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/Decorator.java similarity index 98% rename from HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorControl.java rename to HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/Decorator.java index fedea6f00..c11c0d8cf 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorControl.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/Decorator.java @@ -30,7 +30,7 @@ import javafx.scene.layout.StackPane; import javafx.stage.Stage; import javafx.stage.StageStyle; -public class DecoratorControl extends Control { +public class Decorator extends Control { private final ListProperty drawer = new SimpleListProperty<>(FXCollections.observableArrayList()); private final ListProperty content = new SimpleListProperty<>(FXCollections.observableArrayList()); private final ListProperty container = new SimpleListProperty<>(FXCollections.observableArrayList()); @@ -49,7 +49,7 @@ public class DecoratorControl extends Control { private final Stage primaryStage; private StackPane drawerWrapper; - public DecoratorControl(Stage primaryStage) { + public Decorator(Stage primaryStage) { this.primaryStage = primaryStage; primaryStage.initStyle(StageStyle.UNDECORATED); 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 a0a57723a..5e4eb1404 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 @@ -69,7 +69,7 @@ import static org.jackhuang.hmcl.util.Logging.LOG; public class DecoratorController { private static final String PROPERTY_DIALOG_CLOSE_HANDLER = DecoratorController.class.getName() + ".dialog.closeListener"; - private final DecoratorControl decorator; + private final Decorator decorator; private final ImageView welcomeView; private final Navigator navigator; private final Node mainPage; @@ -80,7 +80,7 @@ public class DecoratorController { public DecoratorController(Stage stage, Node mainPage) { this.mainPage = mainPage; - decorator = new DecoratorControl(stage); + decorator = new Decorator(stage); decorator.titleProperty().set(Metadata.TITLE); decorator.setOnCloseButtonAction(Launcher::stopApplication); @@ -114,7 +114,7 @@ public class DecoratorController { setupAuthlibInjectorDnD(); } - public DecoratorControl getDecorator() { + public Decorator getDecorator() { return decorator; } 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 5bafbb4af..d5f309b23 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 @@ -42,7 +42,7 @@ import org.jackhuang.hmcl.ui.FXUtils; import org.jackhuang.hmcl.ui.SVG; import org.jackhuang.hmcl.util.Lang; -public class DecoratorSkin extends SkinBase { +public class DecoratorSkin extends SkinBase { private static final SVGGlyph minus = Lang.apply(new SVGGlyph(0, "MINUS", "M804.571 420.571v109.714q0 22.857-16 38.857t-38.857 16h-694.857q-22.857 0-38.857-16t-16-38.857v-109.714q0-22.857 16-38.857t38.857-16h694.857q22.857 0 38.857 16t16 38.857z", Color.WHITE), glyph -> { glyph.setSize(12, 2); glyph.setTranslateY(4); }); @@ -62,14 +62,14 @@ public class DecoratorSkin extends SkinBase { * * @param control The control for which this Skin should attach to. */ - public DecoratorSkin(DecoratorControl control) { + public DecoratorSkin(Decorator control) { super(control); primaryStage = control.getPrimaryStage(); minus.fillProperty().bind(Theme.foregroundFillBinding()); - DecoratorControl skinnable = getSkinnable(); + Decorator skinnable = getSkinnable(); BorderPane root = new BorderPane(); root.getStyleClass().setAll("jfx-decorator", "resize-border");