peet/Gruppe-02-clone
1
0
Fork 0
mirror of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git synced 2024-11-25 15:09:43 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

buttons now work as intended

Browse Source
This commit is contained in:
Johannes Schmelz 2024-11-25 01:51:27 +01:00
parent c87406f60e
commit 1a75d6d6a8
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projekte/monopoly/client/src/main/java/pp/monopoly/client/MonopolyApp.java
View File

@ -434,4 +434,8 @@ public class MonopolyApp extends SimpleApplication implements MonopolyClient, Ga
.build() .build()
.open(); .open();
} }
public void disconnect() {
serverConnection.disconnect();
}
} }

13
Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/CreateGameMenu.java
View File

@ -68,17 +68,20 @@ public class CreateGameMenu extends Dialog {
addChild(input); addChild(input);
// "Abbrechen"-Button // "Abbrechen"-Button
cancelButton.setPreferredSize(new Vector3f(120, 40, 0)); cancelButton.setPreferredSize(new Vector3f(120, 40, 0));
cancelButton.addClickCommands(source -> close()); cancelButton.addClickCommands(s -> ifTopDialog(() -> {
this.close();
new StartMenu(network.getApp()).open();
}));
addChild(cancelButton); addChild(cancelButton);
cancelButton.addClickCommands(s -> new StartMenu(app));
// "Selber hosten"-Button // "Selber hosten"-Button
addChild(serverButton).addClickCommands(s -> startServerInThread()); serverButton.addClickCommands(s -> ifTopDialog(this::startServerInThread));
addChild(serverButton);
// "Beitreten"-Button // "Beitreten"-Button
joinButton.setPreferredSize(new Vector3f(120, 40, 0)); joinButton.setPreferredSize(new Vector3f(120, 40, 0));
joinButton.addClickCommands(s -> ifTopDialog(this::connect));
addChild(joinButton); addChild(joinButton);
joinButton.addClickCommands(s -> connect());
} }
/** /**
@ -125,7 +128,7 @@ public class CreateGameMenu extends Dialog {
@Override @Override
public void escape() { public void escape() {
close(); new SettingsMenu(network.getApp()).open();
} }
/** /**

10
Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/LobbyMenu.java
View File

@ -130,10 +130,12 @@ public class LobbyMenu extends Dialog {
buttonContainer.setBackground(null); buttonContainer.setBackground(null);
// Lower-left container for "Abbrechen" button // Lower-left container for "Abbrechen" button
lowerLeftMenu = new Container(); lowerLeftMenu = new Container();
Button cancelButton = new Button("Abbrechen"); Button cancelButton = new Button("Beenden");
cancelButton.setPreferredSize(new Vector3f(200, 60, 0)); // Set size to match the appearance in the image cancelButton.setPreferredSize(new Vector3f(200, 60, 0)); // Set size to match the appearance in the image
cancelButton.setFontSize(18); // Adjust font size cancelButton.setFontSize(18); // Adjust font size
cancelButton.addClickCommands(source -> close()); // Add functionality cancelButton.addClickCommands(source -> ifTopDialog( () -> {
app.closeApp();
})); // Add functionality
lowerLeftMenu.addChild(cancelButton); lowerLeftMenu.addChild(cancelButton);
// Position the container near the bottom-left corner // Position the container near the bottom-left corner
@ -146,7 +148,7 @@ public class LobbyMenu extends Dialog {
readyButton.setPreferredSize(new Vector3f(200, 60, 0)); // Set size to match the appearance in the image readyButton.setPreferredSize(new Vector3f(200, 60, 0)); // Set size to match the appearance in the image
readyButton.setFontSize(18); // Adjust font size readyButton.setFontSize(18); // Adjust font size
readyButton.setBackground(new QuadBackgroundComponent(ColorRGBA.Green)); // Add color to match the style readyButton.setBackground(new QuadBackgroundComponent(ColorRGBA.Green)); // Add color to match the style
readyButton.addClickCommands(source -> toggleReady()); // Add functionality readyButton.addClickCommands(source -> ifTopDialog(this::toggleReady)); // Add functionality
lowerRightMenu.addChild(readyButton); lowerRightMenu.addChild(readyButton);
// Position the container near the bottom-right corner // Position the container near the bottom-right corner
@ -210,7 +212,7 @@ public class LobbyMenu extends Dialog {
@Override @Override
public void escape() { public void escape() {
super.close(); new SettingsMenu(app).open();
} }
/** /**

2
Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/StartMenu.java
View File

@ -117,7 +117,7 @@ public class StartMenu extends Dialog {
@Override @Override
public void escape() { public void escape() {
super.close(); new SettingsMenu(app).open();
} }
@Override @Override