AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-15 14:56:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename DecoratorControl to Decorator

Browse Source
This commit is contained in:
huanghongxun 2018-10-11 13:32:39 +08:00
parent 355fc04069
commit 6f6efe0874
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorControl.java → HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/Decorator.java
View File

@ -30,7 +30,7 @@ import javafx.scene.layout.StackPane;
import javafx.stage.Stage; import javafx.stage.Stage;
import javafx.stage.StageStyle; import javafx.stage.StageStyle;
public class DecoratorControl extends Control { public class Decorator extends Control {
private final ListProperty<Node> drawer = new SimpleListProperty<>(FXCollections.observableArrayList()); private final ListProperty<Node> drawer = new SimpleListProperty<>(FXCollections.observableArrayList());
private final ListProperty<Node> content = new SimpleListProperty<>(FXCollections.observableArrayList()); private final ListProperty<Node> content = new SimpleListProperty<>(FXCollections.observableArrayList());
private final ListProperty<Node> container = new SimpleListProperty<>(FXCollections.observableArrayList()); private final ListProperty<Node> container = new SimpleListProperty<>(FXCollections.observableArrayList());
@ -49,7 +49,7 @@ public class DecoratorControl extends Control {
private final Stage primaryStage; private final Stage primaryStage;
private StackPane drawerWrapper; private StackPane drawerWrapper;
public DecoratorControl(Stage primaryStage) { public Decorator(Stage primaryStage) {
this.primaryStage = primaryStage; this.primaryStage = primaryStage;
primaryStage.initStyle(StageStyle.UNDECORATED); primaryStage.initStyle(StageStyle.UNDECORATED);

6
HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorController.java
View File

@ -69,7 +69,7 @@ import static org.jackhuang.hmcl.util.Logging.LOG;
public class DecoratorController { public class DecoratorController {
private static final String PROPERTY_DIALOG_CLOSE_HANDLER = DecoratorController.class.getName() + ".dialog.closeListener"; 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 ImageView welcomeView;
private final Navigator navigator; private final Navigator navigator;
private final Node mainPage; private final Node mainPage;
@ -80,7 +80,7 @@ public class DecoratorController {
public DecoratorController(Stage stage, Node mainPage) { public DecoratorController(Stage stage, Node mainPage) {
this.mainPage = mainPage; this.mainPage = mainPage;
decorator = new DecoratorControl(stage); decorator = new Decorator(stage);
decorator.titleProperty().set(Metadata.TITLE); decorator.titleProperty().set(Metadata.TITLE);
decorator.setOnCloseButtonAction(Launcher::stopApplication); decorator.setOnCloseButtonAction(Launcher::stopApplication);
@ -114,7 +114,7 @@ public class DecoratorController {
setupAuthlibInjectorDnD(); setupAuthlibInjectorDnD();
} }
public DecoratorControl getDecorator() { public Decorator getDecorator() {
return decorator; return decorator;
} }

6
HMCL/src/main/java/org/jackhuang/hmcl/ui/decorator/DecoratorSkin.java
View File

@ -42,7 +42,7 @@ import org.jackhuang.hmcl.ui.FXUtils;
import org.jackhuang.hmcl.ui.SVG; import org.jackhuang.hmcl.ui.SVG;
import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.Lang;
public class DecoratorSkin extends SkinBase<DecoratorControl> { public class DecoratorSkin extends SkinBase<Decorator> {
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), 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); }); glyph -> { glyph.setSize(12, 2); glyph.setTranslateY(4); });
@ -62,14 +62,14 @@ public class DecoratorSkin extends SkinBase<DecoratorControl> {
* *
* @param control The control for which this Skin should attach to. * @param control The control for which this Skin should attach to.
*/ */
public DecoratorSkin(DecoratorControl control) { public DecoratorSkin(Decorator control) {
super(control); super(control);
primaryStage = control.getPrimaryStage(); primaryStage = control.getPrimaryStage();
minus.fillProperty().bind(Theme.foregroundFillBinding()); minus.fillProperty().bind(Theme.foregroundFillBinding());
DecoratorControl skinnable = getSkinnable(); Decorator skinnable = getSkinnable();
BorderPane root = new BorderPane(); BorderPane root = new BorderPane();
root.getStyleClass().setAll("jfx-decorator", "resize-border"); root.getStyleClass().setAll("jfx-decorator", "resize-border");