diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/ListOfLobbiesController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/ListOfLobbiesController.java index c0fad92..4fa663a 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/ListOfLobbiesController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/ListOfLobbiesController.java @@ -91,7 +91,7 @@ public class ListOfLobbiesController implements Initializable { } HBox rootHBox = new HBox(); rootHBox.setPrefWidth(300); - rootHBox.setMaxHeight(37); + rootHBox.setMaxHeight(45); String statusLobby; if (isOpen) { statusLobby = " (open)"; @@ -112,7 +112,7 @@ public class ListOfLobbiesController implements Initializable { for (String member : members) { HBox memberBox = new HBox(); memberBox.setPrefWidth(300); - memberBox.setMaxHeight(37); + memberBox.setMaxHeight(45); memberBox.setPrefHeight(USE_COMPUTED_SIZE); Label memberLabel = new Label("- " + member); memberLabel.setTextFill(Color.WHITE); @@ -123,8 +123,9 @@ public class ListOfLobbiesController implements Initializable { TreeView treeView = new TreeView<>(root); treeView.setVisible(true); treeView.setPrefWidth(300); - treeView.setPrefHeight(i*37 + 10); - treeView.setMaxHeight(i*37 + 10); + treeView.setMinHeight(i*45 + 10); + treeView.setPrefHeight(i*45 + 10); + treeView.setMaxHeight(i*45 + 10); Platform.runLater(new Runnable() { @Override public void run() { diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyDisplayHandler.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyDisplayHandler.java index 24e2dfe..b4bc033 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyDisplayHandler.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyDisplayHandler.java @@ -115,7 +115,7 @@ public class LobbyDisplayHandler { LobbyDisplayHandler handler = new LobbyDisplayHandler(); String lobby = "1:Seraina:true:Alex:Jonas$2:Sebi:false:Maria:Claudia:Hansli$3:Vanessa:true:Lara:Flu"; handler.updateLobbies(lobby); - System.out.println("lobby size in main:" + lobbies.size()); + //System.out.println("lobby size in main:" + lobbies.size()); for (LobbyModel model : lobbies) { //System.out.println(model); System.out.println("Lobby " + model.getId() + " " + model.isLobbyIsOpen() + " (" + model.getAdmin() + "):"); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java index 37ded19..e5c6c0d 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java @@ -168,6 +168,8 @@ public class LoungeSceneViewController implements Initializable { LOGGER.debug(" in GameView()" + chatApp); allLobbyElementsBorderPane.setVisible(false); gameDisplayAnchorPane.getChildren().add(chatApp.game); + chatApp.getGameController().clearAllNoiseDisplay(); + chatApp.getGameController().clearNotificationText(); } catch (Exception e) { LOGGER.debug("Not yet initialized"); } @@ -185,6 +187,8 @@ public class LoungeSceneViewController implements Initializable { try { trainAnimationDayController.showFullWagon(); allLobbyElementsBorderPane.setVisible(true); + chatApp.getGameController().clearAllNoiseDisplay(); + chatApp.getGameController().clearNotificationText(); gameDisplayAnchorPane.getChildren().clear(); } catch (Exception e) { LOGGER.debug("Not yet initialized"); diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/logo.jpg b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/logo.jpg new file mode 100644 index 0000000..0312268 Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/logo.jpg differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/loungStyle.css b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/loungStyle.css index 8c1daff..1055a5e 100644 --- a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/loungStyle.css +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/loungStyle.css @@ -3,6 +3,12 @@ -fx-font-size: 15; } +#backGroundAnchorPane{ + -fx-background-image: url(logo.jpg); + -fx-background-size: 100%; + -fx-background-position: center; + -fx-background-repeat: no-repeat; +} .anchorPane{ -fx-alignment: center;