Fixes
This commit is contained in:
commit
95f72fe4e8
@ -86,7 +86,12 @@ public class HappyBirdMain extends Application {
|
|||||||
menuButton.setLayoutX(575);
|
menuButton.setLayoutX(575);
|
||||||
menuButton.setLayoutY(625);
|
menuButton.setLayoutY(625);
|
||||||
menuButton.setVisible(false);
|
menuButton.setVisible(false);
|
||||||
|
<<<<<<< HEAD
|
||||||
startGame.setVisible(false);
|
startGame.setVisible(false);
|
||||||
|
=======
|
||||||
|
|
||||||
|
//Button buttons[] = {startButton, highscoresButton, settingsButton};
|
||||||
|
>>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de
|
||||||
|
|
||||||
int yPosition = 225;
|
int yPosition = 225;
|
||||||
for (Button button : buttons) {
|
for (Button button : buttons) {
|
||||||
@ -108,10 +113,19 @@ public class HappyBirdMain extends Application {
|
|||||||
|
|
||||||
startGame.setVisible(false);
|
startGame.setVisible(false);
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
Label nameLabel = new Label("Name:");
|
Label nameLabel = new Label("Name:");
|
||||||
Label acronymLabel = new Label("Kürzel:");
|
Label acronymLabel = new Label("Kürzel:");
|
||||||
|
|
||||||
Label startLabels[] = {nameLabel, acronymLabel};
|
Label startLabels[] = {nameLabel, acronymLabel};
|
||||||
|
=======
|
||||||
|
startButton.setOnAction(event -> {
|
||||||
|
headline.setText("Start");
|
||||||
|
for(Button button : buttons) {
|
||||||
|
button.setVisible(false);
|
||||||
|
menuButton.setVisible(true);
|
||||||
|
}
|
||||||
|
>>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de
|
||||||
|
|
||||||
int yPositionStartLabels = 225;
|
int yPositionStartLabels = 225;
|
||||||
for(Label label : startLabels) {
|
for(Label label : startLabels) {
|
||||||
@ -174,7 +188,11 @@ public class HappyBirdMain extends Application {
|
|||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
startGame.setOnAction(event -> {});
|
startGame.setOnAction(event -> {});
|
||||||
|
=======
|
||||||
|
//startButton.setOnAction(event -> {});
|
||||||
|
>>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user