PBS2H20AAL/HappyBird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mehr bugs

Browse Source
This commit is contained in:
Mats Pape 2021-11-26 11:59:38 +01:00
parent 95f72fe4e8
commit 6697cdef8e
9 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin
View File

Binary file not shown.

BIN
Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock
View File

Binary file not shown.

BIN
Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin
View File

Binary file not shown.

BIN
Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock
View File

Binary file not shown.

BIN
Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock
View File

Binary file not shown.

BIN
Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class
View File

Binary file not shown.

BIN
Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar
View File

Binary file not shown.

BIN
Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin
View File

Binary file not shown.

22
Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java
View File

@ -86,12 +86,10 @@ 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}; //Button buttons[] = {startButton, highscoresButton, settingsButton};
>>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de
int yPosition = 225; int yPosition = 225;
for (Button button : buttons) { for (Button button : buttons) {
@ -113,22 +111,20 @@ 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 -> {
startButton.setOnAction(event -> {
headline.setText("Start"); headline.setText("Start");
for(Button button : buttons) { for (Button button : buttons) {
button.setVisible(false); button.setVisible(false);
menuButton.setVisible(true); menuButton.setVisible(true);
} }
>>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de });
int yPositionStartLabels = 225; int yPositionStartLabels = 225;
for(Label label : startLabels) { for (Label label : startLabels) {
label.setPrefSize(250, 50); label.setPrefSize(250, 50);
label.setStyle("-fx-background-color: #DED894; " + label.setStyle("-fx-background-color: #DED894; " +
"-fx-text-fill: #000000; " + "-fx-text-fill: #000000; " +
@ -154,7 +150,7 @@ public class HappyBirdMain extends Application {
TextField inputFields[] = {name, acronym}; TextField inputFields[] = {name, acronym};
int yPositionInputFields = 290; int yPositionInputFields = 290;
for(TextField feld : inputFields) { for (TextField feld : inputFields) {
feld.setPrefSize(250, 50); feld.setPrefSize(250, 50);
feld.setStyle("-fx-font-size: 20px;" + feld.setStyle("-fx-font-size: 20px;" +
"-fx-font-weight: bold;"); "-fx-font-weight: bold;");
@ -167,6 +163,7 @@ public class HappyBirdMain extends Application {
feld.setVisible(false); feld.setVisible(false);
} }
startButton.setOnAction(event -> { startButton.setOnAction(event -> {
headline.setText("Start"); headline.setText("Start");
for(Button button : buttons) { for(Button button : buttons) {
@ -188,11 +185,8 @@ public class HappyBirdMain extends Application {
}); });
<<<<<<< HEAD //startGame.setOnAction(event -> {});
startGame.setOnAction(event -> {});
=======
//startButton.setOnAction(event -> {}); //startButton.setOnAction(event -> {});
>>>>>>> c82816957310f4cb126c980ad371abcdaba0d6de