Skip to content
Snippets Groups Projects
Commit e9012e5d authored by Tran Peter's avatar Tran Peter
Browse files

fix(ui): fix weird drop down menu behaviour

parent f04affe5
No related branches found
No related tags found
5 merge requests!74V1,!73Initial commit,!71Merge DataBase into Development,!54Update: coreMaps.json (added new maps),!49Merge ui into development
Hide whitespace changes
Inline Side-by-side
src/main/resources/fxml/LocalCreate.fxml
+ 2
− 2
View file @ e9012e5d
......@@ -17,7 +17,7 @@
<VBox fx:id="parent" alignment="BOTTOM_CENTER" 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">
<children>
<Pane VBox.vgrow="ALWAYS" />
<HBox alignment="TOP_CENTER" spacing="20.0">
<HBox alignment="CENTER" spacing="20.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Rounds:" />
<Accordion>
......@@ -52,7 +52,7 @@
</VBox.margin>
</HBox>
<Pane VBox.vgrow="ALWAYS" />
<HBox alignment="TOP_CENTER" spacing="20.0">
<HBox alignment="CENTER" spacing="20.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Time:" />
<Accordion>
......
src/main/resources/fxml/MapSelection.fxml
+ 66
− 59
View file @ e9012e5d
......@@ -12,70 +12,77 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Text?>
<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.MapSelectionController">
<HBox xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.hdm_stuttgart.battlearena.Controller.MapSelectionController">
<children>
<Pane VBox.vgrow="ALWAYS" />
<HBox alignment="TOP_CENTER" spacing="20.0">
<Pane HBox.hgrow="ALWAYS" />
<VBox fx:id="parent" alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Maps:" />
<Accordion>
<panes>
<TitledPane fx:id="maps" text="Select">
<content>
<ScrollPane minViewportHeight="200.0">
<Pane VBox.vgrow="ALWAYS" />
<HBox alignment="CENTER_LEFT" spacing="20.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Maps:" />
<Accordion>
<panes>
<TitledPane fx:id="maps" text="Select">
<content>
<VBox fx:id="boxBox" />
<ScrollPane minViewportHeight="200.0">
<content>
<VBox fx:id="boxBox" />
</content>
</ScrollPane>
</content>
</ScrollPane>
</content>
</TitledPane>
</panes>
</Accordion>
</children>
<VBox.margin>
<Insets />
</VBox.margin>
</HBox>
<HBox alignment="TOP_CENTER" spacing="20.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Texture pack:" />
<Accordion>
<panes>
<TitledPane fx:id="textures" text="Select">
<content>
<ScrollPane minViewportHeight="200.0">
</TitledPane>
</panes>
</Accordion>
</children>
<VBox.margin>
<Insets />
</VBox.margin>
</HBox>
<HBox alignment="CENTER_LEFT" spacing="20.0">
<children>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Texture pack:" />
<Accordion>
<panes>
<TitledPane fx:id="textures" text="Select">
<content>
<VBox fx:id="boxBox1" alignment="CENTER_LEFT">
<children>
<ToggleButton mnemonicParsing="false" text="Bomberman">
<toggleGroup>
<ToggleGroup fx:id="textureToggle" />
</toggleGroup>
</ToggleButton>
<ToggleButton mnemonicParsing="false" text="Dark Lands" toggleGroup="$textureToggle" />
<ToggleButton mnemonicParsing="false" text="Forrest" toggleGroup="$textureToggle" />
<ToggleButton mnemonicParsing="false" text="Grass" toggleGroup="$textureToggle" />
</children>
</VBox>
<ScrollPane minViewportHeight="200.0">
<content>
<VBox fx:id="boxBox1" alignment="CENTER_LEFT">
<children>
<ToggleButton mnemonicParsing="false" text="Bomberman">
<toggleGroup>
<ToggleGroup fx:id="textureToggle" />
</toggleGroup>
</ToggleButton>
<ToggleButton mnemonicParsing="false" text="Dark Lands" toggleGroup="$textureToggle" />
<ToggleButton mnemonicParsing="false" text="Forrest" toggleGroup="$textureToggle" />
<ToggleButton mnemonicParsing="false" text="Grass" toggleGroup="$textureToggle" />
</children>
</VBox>
</content>
</ScrollPane>
</content>
</ScrollPane>
</content>
</TitledPane>
</panes>
</Accordion>
</children>
</HBox>
<HBox alignment="TOP_CENTER" maxWidth="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="213.0" spacing="20.0">
<children>
<Text fx:id="selectedMapText" strokeType="OUTSIDE" strokeWidth="0.0" />
</TitledPane>
</panes>
</Accordion>
</children>
</HBox>
<HBox alignment="TOP_CENTER" maxWidth="-Infinity" minWidth="-Infinity" prefHeight="25.0" prefWidth="213.0" spacing="20.0">
<children>
<Text fx:id="selectedMapText" strokeType="OUTSIDE" strokeWidth="0.0" />
</children>
</HBox>
<Button mnemonicParsing="false" onAction="#gameScene" text="Start" />
<Button mnemonicParsing="false" onAction="#backButton" text="Back">
<VBox.margin>
<Insets bottom="50.0" />
</VBox.margin>
</Button>
<Pane VBox.vgrow="ALWAYS" />
</children>
</HBox>
<Button mnemonicParsing="false" onAction="#gameScene" text="Start" />
<Button mnemonicParsing="false" onAction="#backButton" text="Back">
<VBox.margin>
<Insets bottom="50.0" />
</VBox.margin>
</Button>
<Pane VBox.vgrow="ALWAYS" />
</VBox>
<Pane HBox.hgrow="ALWAYS" />
</children>
</VBox>
</HBox>
src/main/resources/player/appSettings.json
+ 1
− 1
View file @ e9012e5d
{
"sfxVolume": 0,
"sfxVolume": 27,
"musicVolume": 11
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment