Skip to content
Snippets Groups Projects
Commit fa9805af authored by Robert Goldmann's avatar Robert Goldmann
Browse files

added max height to vboxpowerups

parent 3eb6ed4f
No related branches found
No related tags found
1 merge request!49merge power-ups into master
Show whitespace changes
Inline Side-by-side
bin/de/bricked/ui/LevelGUI.fxml
+ 3
− 3
View file @ fa9805af
......@@ -10,7 +10,7 @@
<AnchorPane fx:id="anchorPane" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.bricked.ui.LevelController">
<children>
<AnchorPane fx:id="anchorPaneGame" layoutX="14.0" layoutY="125.0" minHeight="650.0" minWidth="670.0" prefHeight="650.0" prefWidth="670.0" AnchorPane.bottomAnchor="25.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="116.0" AnchorPane.topAnchor="125.0">
<AnchorPane fx:id="anchorPaneGame" layoutX="14.0" layoutY="125.0" minHeight="650.0" minWidth="670.0" prefHeight="650.0" prefWidth="670.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="116.0" AnchorPane.topAnchor="125.0">
<children>
<Label fx:id="labelMultiplicator" alignment="CENTER" contentDisplay="CENTER" layoutX="301.0" layoutY="502.0" prefHeight="45.0" prefWidth="100.0" textAlignment="CENTER">
<font>
......@@ -18,7 +18,7 @@
</font>
</Label>
</children></AnchorPane>
<VBox fx:id="vboxPowerUps" layoutX="745.0" layoutY="125.0" minHeight="338.0" minWidth="40.0" prefHeight="402.0" prefWidth="90.0" AnchorPane.bottomAnchor="273.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="125.0" />
<VBox fx:id="vboxPowerUps" layoutX="745.0" layoutY="125.0" maxHeight="490.0" minHeight="338.0" minWidth="40.0" prefHeight="490.0" prefWidth="90.0" AnchorPane.bottomAnchor="185.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="125.0" />
<HBox alignment="CENTER" layoutX="34.0" layoutY="23.0" prefHeight="100.0" prefWidth="275.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
<children>
<Button fx:id="buttonBack" mnemonicParsing="false" onAction="#back" text="Back" />
......@@ -64,7 +64,7 @@
</Label>
</children>
</HBox>
<VBox fx:id="vboxLives" layoutX="745.0" layoutY="603.0" minHeight="71.0" minWidth="40.0" prefHeight="237.0" prefWidth="90.0" AnchorPane.bottomAnchor="24.0" AnchorPane.rightAnchor="14.0" />
<VBox fx:id="vboxLives" layoutX="745.0" layoutY="603.0" minHeight="71.0" minWidth="40.0" prefHeight="160.0" prefWidth="90.0" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="14.0" />
<Label fx:id="labelFPS" layoutX="770.0" layoutY="6.0" text="0" AnchorPane.rightAnchor="8.0" AnchorPane.topAnchor="8.0">
<font>
<Font name="System Bold" size="16.0" />
......
src/de/bricked/ui/LevelController.java
+ 2
− 2
View file @ fa9805af
......@@ -672,8 +672,8 @@ public class LevelController
for(int i = 0; i < game.getLivesRemaining() - 1; i++)
{
ImageView iv = new ImageView(new Image("de/bricked/resources/textures/paddle/paddle-extra-small.png"));
iv.setFitWidth(30);
ImageView iv = new ImageView(new Image("de/bricked/resources/textures/paddle/paddle-small.png"));
iv.setFitWidth(70);
iv.setFitHeight(120 / MAX_LIVES);
vboxLives.getChildren().add(iv);
}
......
src/de/bricked/ui/LevelGUI.fxml
+ 3
− 3
View file @ fa9805af
......@@ -10,7 +10,7 @@
<AnchorPane fx:id="anchorPane" prefHeight="800.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.60" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.bricked.ui.LevelController">
<children>
<AnchorPane fx:id="anchorPaneGame" layoutX="14.0" layoutY="125.0" minHeight="650.0" minWidth="670.0" prefHeight="650.0" prefWidth="670.0" AnchorPane.bottomAnchor="25.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="116.0" AnchorPane.topAnchor="125.0">
<AnchorPane fx:id="anchorPaneGame" layoutX="14.0" layoutY="125.0" minHeight="650.0" minWidth="670.0" prefHeight="650.0" prefWidth="670.0" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="116.0" AnchorPane.topAnchor="125.0">
<children>
<Label fx:id="labelMultiplicator" alignment="CENTER" contentDisplay="CENTER" layoutX="301.0" layoutY="502.0" prefHeight="45.0" prefWidth="100.0" textAlignment="CENTER">
<font>
......@@ -18,7 +18,7 @@
</font>
</Label>
</children></AnchorPane>
<VBox fx:id="vboxPowerUps" layoutX="745.0" layoutY="125.0" minHeight="338.0" minWidth="40.0" prefHeight="402.0" prefWidth="90.0" AnchorPane.bottomAnchor="273.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="125.0" />
<VBox fx:id="vboxPowerUps" layoutX="745.0" layoutY="125.0" maxHeight="490.0" minHeight="338.0" minWidth="40.0" prefHeight="490.0" prefWidth="90.0" AnchorPane.bottomAnchor="185.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="125.0" />
<HBox alignment="CENTER" layoutX="34.0" layoutY="23.0" prefHeight="100.0" prefWidth="275.0" AnchorPane.leftAnchor="14.0" AnchorPane.rightAnchor="14.0" AnchorPane.topAnchor="14.0">
<children>
<Button fx:id="buttonBack" mnemonicParsing="false" onAction="#back" text="Back" />
......@@ -64,7 +64,7 @@
</Label>
</children>
</HBox>
<VBox fx:id="vboxLives" layoutX="745.0" layoutY="603.0" minHeight="71.0" minWidth="40.0" prefHeight="237.0" prefWidth="90.0" AnchorPane.bottomAnchor="24.0" AnchorPane.rightAnchor="14.0" />
<VBox fx:id="vboxLives" layoutX="745.0" layoutY="603.0" minHeight="71.0" minWidth="40.0" prefHeight="160.0" prefWidth="90.0" AnchorPane.bottomAnchor="14.0" AnchorPane.rightAnchor="14.0" />
<Label fx:id="labelFPS" layoutX="770.0" layoutY="6.0" text="0" AnchorPane.rightAnchor="8.0" AnchorPane.topAnchor="8.0">
<font>
<Font name="System Bold" size="16.0" />
......
src/de/bricked/utils/CountdownTimer.java
+ 2
− 1
View file @ fa9805af
......@@ -21,6 +21,7 @@ public class CountdownTimer
{
this.count = seconds;
this.hbox = hbox;
this.levelController = levelController;
self = this;
start();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment