diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java index c3abb1068632795a70cfec81b2f5bc0cf594d921..1ad88720ac74ffd3f76a6019d8122c1ca94179e4 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/LocalCreateController.java @@ -1,14 +1,15 @@ package de.hdm_stuttgart.battlearena.Controller; import javafx.fxml.FXML; -import javafx.scene.layout.BorderPane; import javafx.scene.layout.Pane; +import javafx.scene.layout.VBox; public class LocalCreateController extends SceneLoader { - @FXML public BorderPane parent; + @FXML public VBox parent; public void playScene() { + parent.getChildren().clear(); Pane pane = new Pane(loadScene("Play")); - parent.setCenter(pane.getChildren().get(0)); + parent.getChildren().add(pane.getChildren().get(0)); } } diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java index 054f92b0e0fc3619eea9ac334ce70977a66e15e9..ee3480074884acad6c6232d30608f306ac6d229b 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MainMenuController.java @@ -7,7 +7,7 @@ import javafx.scene.layout.Pane; import javafx.stage.Stage; public class MainMenuController extends SceneLoader { - @FXML public BorderPane parent; + @FXML public BorderPane parent; @FXML public Button exitButton; public static Pane center; diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java index 35ce9c8b5cc56b6df8b25bf434abd1236f674c95..cdf1e8efa87653f9ff2f4f0b752c2296b16857ac 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerController.java @@ -1,24 +1,27 @@ package de.hdm_stuttgart.battlearena.Controller; import javafx.fxml.FXML; -import javafx.scene.layout.BorderPane; import javafx.scene.layout.Pane; +import javafx.scene.layout.VBox; public class MultiplayerController extends SceneLoader { - @FXML public BorderPane parent; + @FXML public VBox parent; public void multiplayerCreateScene() { + parent.getChildren().clear(); Pane pane = new Pane(loadScene("MultiplayerCreate")); - parent.setCenter(pane.getChildren().get(0)); + parent.getChildren().add(pane.getChildren().get(0)); } public void multiplayerJoinScene() { + parent.getChildren().clear(); Pane pane = new Pane(loadScene("MultiplayerJoin")); - parent.setCenter(pane.getChildren().get(0)); + parent.getChildren().add(pane.getChildren().get(0)); } public void playScene() { + parent.getChildren().clear(); Pane pane = new Pane(loadScene("Play")); - parent.setCenter(pane.getChildren().get(0)); + parent.getChildren().add(pane.getChildren().get(0)); } } diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java index aa497cc6332d0d89d55f8fb500b2aa1ca2f94bc6..a49209d0f7dfdffa48b49f97562ad0a4ba9ccd9f 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerCreateController.java @@ -1,14 +1,15 @@ package de.hdm_stuttgart.battlearena.Controller; import javafx.fxml.FXML; -import javafx.scene.layout.BorderPane; import javafx.scene.layout.Pane; +import javafx.scene.layout.VBox; public class MultiplayerCreateController extends SceneLoader { - @FXML public BorderPane parent; + @FXML public VBox parent; public void multiplayerScene() { + parent.getChildren().clear(); Pane pane = new Pane(loadScene("Multiplayer")); - parent.setCenter(pane.getChildren().get(0)); + parent.getChildren().add(pane.getChildren().get(0)); } } diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java index 436363c2f056662f8901400cacc8c4f1c4ac1c3f..2e450e2a5569bcc9bdc36abc455bbc597d218fec 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/MultiplayerJoinController.java @@ -1,14 +1,15 @@ package de.hdm_stuttgart.battlearena.Controller; import javafx.fxml.FXML; -import javafx.scene.layout.BorderPane; import javafx.scene.layout.Pane; +import javafx.scene.layout.VBox; public class MultiplayerJoinController extends SceneLoader{ - @FXML public BorderPane parent; + @FXML public VBox parent; public void multiplayerScene() { + parent.getChildren().clear(); Pane pane = new Pane(loadScene("Multiplayer")); - parent.setCenter(pane.getChildren().get(0)); + parent.getChildren().add(pane.getChildren().get(0)); } } diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java index f52b4082922a3bae720e3bedad97d20ea5c03f2f..a455f597369aea12b7c6642018b92b0afd15bc02 100644 --- a/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java +++ b/src/main/java/de/hdm_stuttgart/battlearena/Controller/PlayController.java @@ -1,25 +1,26 @@ package de.hdm_stuttgart.battlearena.Controller; import javafx.fxml.FXML; -import javafx.scene.layout.BorderPane; import javafx.scene.layout.Pane; +import javafx.scene.layout.VBox; public class PlayController extends SceneLoader { - @FXML public BorderPane parent; + @FXML public VBox parent; public void mainMenuScene() { -// Pane pane = new Pane(loadScene("MainMenu")); -// parent.setCenter(pane.getChildren().get(0)); - parent.setCenter(MainMenuController.center); + parent.getChildren().clear(); + parent.getChildren().add(MainMenuController.center); } public void localScene() { + parent.getChildren().clear(); Pane pane = new Pane(loadScene("LocalCreate")); - parent.setCenter(pane.getChildren().get(0)); + parent.getChildren().add(pane.getChildren().get(0)); } public void multiplayerScene() { + parent.getChildren().clear(); Pane pane = new Pane(loadScene("Multiplayer")); - parent.setCenter(pane.getChildren().get(0)); + parent.getChildren().add(pane.getChildren().get(0)); } } diff --git a/src/main/resources/fxml/LocalCreate.fxml b/src/main/resources/fxml/LocalCreate.fxml index be5e6de5a2246a3dad20febc3f55ccdf1f1aa08c..86d45470472f8a29622f6268e915610015fec833 100644 --- a/src/main/resources/fxml/LocalCreate.fxml +++ b/src/main/resources/fxml/LocalCreate.fxml @@ -7,100 +7,97 @@ <?import javafx.scene.control.TitledPane?> <?import javafx.scene.control.ToggleGroup?> <?import javafx.scene.layout.AnchorPane?> -<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.VBox?> <?import javafx.scene.text.Text?> -<BorderPane fx:id="parent" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.LocalCreateController"> - <center> - <VBox alignment="TOP_CENTER" spacing="10.0" BorderPane.alignment="TOP_CENTER"> + +<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.LocalCreateController"> + <children> + <HBox alignment="TOP_CENTER" spacing="20.0"> + <children> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Rounds:" /> + <Accordion> + <panes> + <TitledPane animated="false" text="untitled 1"> + <content> + <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" /> + </content> + </TitledPane> + </panes> + </Accordion> + </children> + <VBox.margin> + <Insets /> + </VBox.margin> + </HBox> + <HBox alignment="TOP_CENTER" maxWidth="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="213.0" spacing="20.0"> + <children> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Time:" /> + <Accordion> + <panes> + <TitledPane animated="false" text="untitled 1"> + <content> + <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" /> + </content> + </TitledPane> + </panes> + </Accordion> + </children> + </HBox> + <HBox alignment="TOP_CENTER" spacing="10.0"> + <children> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="PLayers:" /> + <RadioButton mnemonicParsing="false" selected="true" text="2"> + <toggleGroup> + <ToggleGroup fx:id="group31" /> + </toggleGroup> + </RadioButton> + <RadioButton mnemonicParsing="false" text="3" toggleGroup="$group31" /> + <RadioButton mnemonicParsing="false" text="4" /> + </children> + </HBox> + <HBox alignment="TOP_CENTER" spacing="10.0"> + <children> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> + <RadioButton mnemonicParsing="false" text="Yes"> + <toggleGroup> + <ToggleGroup fx:id="group1" /> + </toggleGroup> + </RadioButton> + <RadioButton mnemonicParsing="false" selected="true" text="No" toggleGroup="$group1" /> + </children> + </HBox> + <HBox alignment="TOP_CENTER" spacing="10.0"> + <children> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> + <RadioButton mnemonicParsing="false" text="Yes"> + <toggleGroup> + <ToggleGroup fx:id="group2" /> + </toggleGroup> + </RadioButton> + <RadioButton mnemonicParsing="false" selected="true" text="No" toggleGroup="$group2" /> + </children> + </HBox> + <HBox alignment="TOP_CENTER" spacing="10.0"> <children> - <HBox alignment="TOP_CENTER" spacing="20.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Rounds:" /> - <Accordion> - <panes> - <TitledPane animated="false" text="untitled 1"> - <content> - <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" /> - </content> - </TitledPane> - </panes> - </Accordion> - </children> - <VBox.margin> - <Insets /> - </VBox.margin> - </HBox> - <HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="10.0" maxWidth="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="213.0" spacing="20.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Time:" /> - <Accordion> - <panes> - <TitledPane animated="false" text="untitled 1"> - <content> - <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" /> - </content> - </TitledPane> - </panes> - </Accordion> - </children> - </HBox> - <HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="343.0" spacing="10.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="PLayers:" /> - <RadioButton mnemonicParsing="false" selected="true" text="2"> - <toggleGroup> - <ToggleGroup fx:id="group31" /> - </toggleGroup> - </RadioButton> - <RadioButton mnemonicParsing="false" text="3" toggleGroup="$group31" /> - <RadioButton mnemonicParsing="false" text="4" /> - </children> - </HBox> - <HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="110.0" spacing="10.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> - <RadioButton mnemonicParsing="false" text="Yes"> - <toggleGroup> - <ToggleGroup fx:id="group1" /> - </toggleGroup></RadioButton> - <RadioButton mnemonicParsing="false" selected="true" text="No" toggleGroup="$group1" /> - </children> - </HBox> - <HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="343.0" spacing="10.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> - <RadioButton mnemonicParsing="false" text="Yes"> - <toggleGroup> - <ToggleGroup fx:id="group2" /> - </toggleGroup> - </RadioButton> - <RadioButton mnemonicParsing="false" selected="true" text="No" toggleGroup="$group2" /> - </children> - </HBox> - <HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="393.0" spacing="10.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> - <RadioButton mnemonicParsing="false" text="Yes"> - <toggleGroup> - <ToggleGroup fx:id="group3" /> - </toggleGroup> - </RadioButton> - <RadioButton mnemonicParsing="false" selected="true" text="No" toggleGroup="$group3" /> - </children> - </HBox> - <Button mnemonicParsing="false" text="Start" /> - <Button mnemonicParsing="false" onAction="#playScene" text="Back"> - <VBox.margin> - <Insets bottom="50.0" /> - </VBox.margin> - </Button> - <Pane layoutX="10.0" layoutY="10.0" VBox.vgrow="ALWAYS" /> - <Pane layoutX="10.0" layoutY="389.0" VBox.vgrow="ALWAYS" /> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> + <RadioButton mnemonicParsing="false" text="Yes"> + <toggleGroup> + <ToggleGroup fx:id="group3" /> + </toggleGroup> + </RadioButton> + <RadioButton mnemonicParsing="false" selected="true" text="No" toggleGroup="$group3" /> </children> - </VBox> - </center> -</BorderPane> + </HBox> + <Button mnemonicParsing="false" text="Start" /> + <Button mnemonicParsing="false" onAction="#playScene" text="Back"> + <VBox.margin> + <Insets bottom="50.0" /> + </VBox.margin> + </Button> + <Pane VBox.vgrow="ALWAYS" /> + <Pane VBox.vgrow="ALWAYS" /> + </children> +</VBox> diff --git a/src/main/resources/fxml/Multiplayer.fxml b/src/main/resources/fxml/Multiplayer.fxml index f23ded2bd0c75ded59f2be00dba243eac2059ff0..690769c28f168b253fbfe41f6e5e559e0decc270 100644 --- a/src/main/resources/fxml/Multiplayer.fxml +++ b/src/main/resources/fxml/Multiplayer.fxml @@ -2,34 +2,29 @@ <?import javafx.geometry.Insets?> <?import javafx.scene.control.Button?> -<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.VBox?> -<BorderPane fx:id="parent" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MultiplayerController"> - <center> - <VBox alignment="TOP_CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="100.0" spacing="50.0" BorderPane.alignment="CENTER"> - <children> - <Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" /> - <Button mnemonicParsing="false" onAction="#multiplayerCreateScene" text="Create" VBox.vgrow="ALWAYS"> - <VBox.margin> - <Insets top="20.0" /> - </VBox.margin> - </Button> - <Button mnemonicParsing="false" onAction="#multiplayerJoinScene" text="Join" VBox.vgrow="ALWAYS"> - <VBox.margin> - <Insets bottom="50.0" /> - </VBox.margin></Button> - <Button alignment="CENTER" mnemonicParsing="false" onAction="#playScene" text="Back"> - <VBox.margin> - <Insets /> - </VBox.margin></Button> - <Pane VBox.vgrow="ALWAYS" /> - <Pane layoutX="10.0" layoutY="410.0" VBox.vgrow="ALWAYS" /> - </children> - </VBox> - </center> - <bottom> - <VBox alignment="CENTER" maxHeight="1.7976931348623157E308" prefWidth="100.0" spacing="10.0" BorderPane.alignment="CENTER" /> - </bottom> -</BorderPane> + +<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="50.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MultiplayerController"> + <children> + <Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" /> + <Button mnemonicParsing="false" onAction="#multiplayerCreateScene" text="Create" VBox.vgrow="ALWAYS"> + <VBox.margin> + <Insets top="20.0" /> + </VBox.margin> + </Button> + <Button mnemonicParsing="false" onAction="#multiplayerJoinScene" text="Join" VBox.vgrow="ALWAYS"> + <VBox.margin> + <Insets bottom="50.0" /> + </VBox.margin> + </Button> + <Button alignment="CENTER" mnemonicParsing="false" onAction="#playScene" text="Back"> + <VBox.margin> + <Insets /> + </VBox.margin> + </Button> + <Pane VBox.vgrow="ALWAYS" /> + <Pane VBox.vgrow="ALWAYS" /> + </children> +</VBox> diff --git a/src/main/resources/fxml/MultiplayerCreate.fxml b/src/main/resources/fxml/MultiplayerCreate.fxml index d9bc89d6a0447c63ef800f264f85ccacf71be198..b0909c0079e798d74543c95dfcb6c6f19d6cf72e 100644 --- a/src/main/resources/fxml/MultiplayerCreate.fxml +++ b/src/main/resources/fxml/MultiplayerCreate.fxml @@ -5,56 +5,52 @@ <?import javafx.scene.control.RadioButton?> <?import javafx.scene.control.TextField?> <?import javafx.scene.layout.AnchorPane?> -<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.VBox?> <?import javafx.scene.text.Text?> -<BorderPane fx:id="parent" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MultiplayerCreateController"> - <center> - <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="20.0" BorderPane.alignment="CENTER"> + +<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MultiplayerCreateController"> + <children> + <Pane VBox.vgrow="ALWAYS" /> + <HBox alignment="TOP_CENTER" spacing="20.0"> <children> - <Pane VBox.vgrow="ALWAYS" /> - <HBox alignment="TOP_CENTER" spacing="20.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> - <TextField /> - </children> - <VBox.margin> - <Insets top="50.0" /> - </VBox.margin> - </HBox> - <HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="10.0" maxWidth="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="213.0" spacing="20.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> - <TextField /> - </children> - </HBox> - <HBox alignment="TOP_CENTER" layoutX="10.0" layoutY="110.0" spacing="10.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> - <RadioButton mnemonicParsing="false" text="Yes" /> - <RadioButton mnemonicParsing="false" text="No" /> - </children> - </HBox> - <AnchorPane minHeight="-Infinity" prefHeight="39.0" prefWidth="600.0"> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> + <TextField /> + </children> + <VBox.margin> + <Insets top="50.0" /> + </VBox.margin> + </HBox> + <HBox alignment="TOP_CENTER" maxWidth="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="213.0" spacing="20.0"> + <children> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> + <TextField /> + </children> + </HBox> + <HBox alignment="TOP_CENTER" spacing="10.0"> + <children> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text:" /> + <RadioButton mnemonicParsing="false" text="Yes" /> + <RadioButton mnemonicParsing="false" text="No" /> + </children> + </HBox> + <AnchorPane minHeight="-Infinity" prefHeight="39.0" prefWidth="600.0"> + <children> + <VBox alignment="TOP_CENTER" layoutX="250.0" prefHeight="200.0" prefWidth="100.0" AnchorPane.leftAnchor="250.0" AnchorPane.rightAnchor="250.0"> <children> - <VBox alignment="TOP_CENTER" layoutX="250.0" prefHeight="200.0" prefWidth="100.0" AnchorPane.leftAnchor="250.0" AnchorPane.rightAnchor="250.0"> - <children> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text" /> - </children> - </VBox> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Text" /> </children> - <VBox.margin> - <Insets top="20.0" /> - </VBox.margin> - </AnchorPane> - <Button mnemonicParsing="false" text="Start" /> - <Button mnemonicParsing="false" onAction="#multiplayerScene" text="Back" /> - <Pane layoutX="10.0" layoutY="398.0" VBox.vgrow="ALWAYS" /> - <Pane layoutX="10.0" layoutY="393.0" VBox.vgrow="ALWAYS" /> + </VBox> </children> - </VBox> - </center> -</BorderPane> + <VBox.margin> + <Insets top="20.0" /> + </VBox.margin> + </AnchorPane> + <Button mnemonicParsing="false" text="Start" /> + <Button mnemonicParsing="false" onAction="#multiplayerScene" text="Back" /> + <Pane VBox.vgrow="ALWAYS" /> + <Pane VBox.vgrow="ALWAYS" /> + </children> +</VBox> diff --git a/src/main/resources/fxml/MultiplayerJoin.fxml b/src/main/resources/fxml/MultiplayerJoin.fxml index 9126182f37fda0a232ec8270eba94debe56c57d5..e8a48e621d53819dee9b9bf53b9440b4bbd1bb9a 100644 --- a/src/main/resources/fxml/MultiplayerJoin.fxml +++ b/src/main/resources/fxml/MultiplayerJoin.fxml @@ -2,24 +2,20 @@ <?import javafx.scene.control.Button?> <?import javafx.scene.control.TextField?> -<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.VBox?> <?import javafx.scene.text.Text?> -<BorderPane fx:id="parent" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MultiplayerJoinController"> - <center> - <VBox alignment="TOP_CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="100.0" spacing="50.0" BorderPane.alignment="CENTER"> - <children> - <Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" /> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="IP Adress:" /> - <TextField maxWidth="-Infinity" /> - <Button mnemonicParsing="false" text="Connect" VBox.vgrow="ALWAYS" /> - <Text strokeType="OUTSIDE" strokeWidth="0.0" text="[Error Message]" /> - <Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" /> - <Button alignment="CENTER" mnemonicParsing="false" onAction="#multiplayerScene" text="Back" /> - <Pane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="20.0" VBox.vgrow="ALWAYS" /> - </children> - </VBox> - </center> -</BorderPane> + +<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="50.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MultiplayerJoinController"> + <children> + <Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" /> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="IP Adress:" /> + <TextField maxWidth="-Infinity" /> + <Button mnemonicParsing="false" text="Connect" VBox.vgrow="ALWAYS" /> + <Text strokeType="OUTSIDE" strokeWidth="0.0" text="[Error Message]" /> + <Pane maxHeight="1.7976931348623157E308" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS" /> + <Button alignment="CENTER" mnemonicParsing="false" onAction="#multiplayerScene" text="Back" /> + <Pane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="20.0" VBox.vgrow="ALWAYS" /> + </children> +</VBox> diff --git a/src/main/resources/fxml/Play.fxml b/src/main/resources/fxml/Play.fxml index ccd2f64c395d76aa20b689a7c3f2606821df61c0..1cdd69e375cc8a700854d3e66b5caa1a8b9d6ad7 100644 --- a/src/main/resources/fxml/Play.fxml +++ b/src/main/resources/fxml/Play.fxml @@ -1,32 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import javafx.geometry.Insets?> <?import javafx.scene.control.Button?> -<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.VBox?> -<BorderPane fx:id="parent" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.PlayController"> - <center> - <VBox alignment="TOP_CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="200.0" prefWidth="100.0" spacing="50.0" BorderPane.alignment="CENTER"> - <children> - <Pane VBox.vgrow="ALWAYS" /> - <Button mnemonicParsing="false" onAction="#localScene" text="Local" VBox.vgrow="ALWAYS"> - <VBox.margin> - <Insets top="20.0" /> - </VBox.margin> - </Button> - <Button mnemonicParsing="false" onAction="#multiplayerScene" text="Multiplayer" VBox.vgrow="ALWAYS" /> - <Button alignment="CENTER" mnemonicParsing="false" onAction="#mainMenuScene" text="Back"> - <VBox.margin> - <Insets top="50.0" /> - </VBox.margin></Button> - <Pane VBox.vgrow="ALWAYS" /> - <Pane layoutX="10.0" layoutY="358.0" VBox.vgrow="ALWAYS" /> - </children> - </VBox> - </center> - <bottom> - <VBox alignment="CENTER" maxHeight="1.7976931348623157E308" prefWidth="100.0" spacing="10.0" BorderPane.alignment="CENTER" /> - </bottom> -</BorderPane> + +<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.PlayController"> + <children> + <Pane VBox.vgrow="ALWAYS" /> + <Button mnemonicParsing="false" onAction="#localScene" text="Local" /> + <Button mnemonicParsing="false" onAction="#multiplayerScene" text="Multiplayer" /> + <Button alignment="CENTER" mnemonicParsing="false" onAction="#mainMenuScene" text="Back" /> + <Pane VBox.vgrow="ALWAYS" /> + <Pane VBox.vgrow="ALWAYS" /> + </children> +</VBox>