diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java index 3248849..bb637a1 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java @@ -106,6 +106,7 @@ public class ChatController implements Initializable { Number newValue) { vBoxChatMessages.setMaxHeight(newValue.doubleValue()); ChatScrollPane.setMaxHeight(newValue.doubleValue() * 2); + ChatScrollPane.setVvalue((Double) newValue); } }); /** diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/utils/ChatLabelConfigurator.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/utils/ChatLabelConfigurator.java index 9b4b112..2dd3153 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/utils/ChatLabelConfigurator.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/utils/ChatLabelConfigurator.java @@ -1,14 +1,17 @@ package ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.utils; import static ch.unibas.dmi.dbis.cs108.multiplayer.helpers.Protocol.whisper; +import static javafx.scene.control.PopupControl.USE_COMPUTED_SIZE; import ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.ClientModel; +import javafx.geometry.Pos; import javafx.scene.control.Label; import javafx.scene.control.TextField; import javafx.scene.layout.Background; import javafx.scene.paint.Color; import javafx.scene.text.Text; +import javafx.scene.text.TextAlignment; /** * Provides utilities to configure Labels for the ChatView {@code ChatView.fxml} @@ -26,9 +29,11 @@ public class ChatLabelConfigurator { //t = new Text(client.getUsername() + " (you): " + msg); l = new Label(client.getUsername() + " (you): " + msg); l.setBackground(Background.fill(Color.LAVENDER)); + l.setAlignment(Pos.CENTER_RIGHT); l.setWrapText(true); l.setMaxHeight(Double.MAX_VALUE); - l.setScaleShape(true); + l.setPrefWidth(1150); + l.setScaleShape(false); } return l; } diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/Chat.css b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/Chat.css index 59a2756..34c1aaa 100644 --- a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/Chat.css +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/Chat.css @@ -2,17 +2,18 @@ } #vBoxChatMessages{ - -fx-background-color: rgba(255,255,255,0.3); + -fx-background-color: transparent; } .anchorPane{ -fx-background-color: transparent; } -*{ - -fx-background-color: transparent; +.label{ + -fx-all: unset; } + .button{ -fx-background-color: midnightblue; -fx-text-fill: lightsteelblue; diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatView.fxml b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatView.fxml index d7cc40d..8002e31 100644 --- a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatView.fxml +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatView.fxml @@ -5,6 +5,8 @@ + + @@ -12,77 +14,87 @@ - + - - - - - - - - + + + + + + - - - - - - + + + + + + + + - - - - - - - - - + + + + + + - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - + + + + + - + - + - - - - - - - + - - + + diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/images/chatwindow.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/images/chatwindow.png new file mode 100644 index 0000000..1ba34a3 Binary files /dev/null and b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/images/chatwindow.png differ diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameDay.css b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameDay.css index df006ca..82edb99 100644 --- a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameDay.css +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/GameDay.css @@ -17,7 +17,6 @@ } - .textField{ -fx-text-fill: white; -fx-background-color: transparent; @@ -32,5 +31,11 @@ -fx-font-family: Bahnschrift; -fx-font-weight: bold; } +.textFlow{ + -fx-alignment: center; + -fx-text-fill: black; + -fx-font-family: Bahnschrift; + -fx-font-weight: bold; +} diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneView.fxml b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneView.fxml index b30bdcd..0c3e2a9 100644 --- a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneView.fxml +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneView.fxml @@ -6,14 +6,15 @@ + - + - + @@ -46,7 +47,11 @@ - + + + + + diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/boarderPane.css b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/boarderPane.css index 73e5272..c9b3d50 100644 --- a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/boarderPane.css +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/boarderPane.css @@ -1,5 +1,6 @@ -*{ - -fx-background-color: transparent; + +.label{ + -fx-all: unset; } #NTtBToolBar{ @@ -8,13 +9,15 @@ } .button{ - -fx-border-color: darkgrey; - -fx-background-color: grey; - -fx-text-fill: white; + -fx-background-color: midnightblue; + -fx-text-fill: lightsteelblue; } .button:pressed{ - -fx-border-color: grey; - -fx-background-color: lightgrey; - -fx-text-fill: black; -} \ No newline at end of file + -fx-background-color: lightsteelblue; + -fx-text-fill: midnightblue; +} + +.button:hover{ + -fx-effect: innershadow(gaussian, lightsteelblue, 10, 0.5 , 2, 2); +} 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 eedb25d..1778ad5 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,10 @@ -fx-background-color: midnightblue; } +#LobbyListView{ + -fx-background-color: transparent; +} + #lobbyPrint{ -fx-background-color: midnightblue; } @@ -14,4 +18,22 @@ .anchorPane{ -fx-alignment: center; +} + +.button{ + -fx-background-color: midnightblue; + -fx-text-fill: lightsteelblue; +} + +.button:pressed{ + -fx-background-color: lightsteelblue; + -fx-text-fill: midnightblue; +} + +.button:hover{ + -fx-effect: innershadow(gaussian, lightsteelblue, 10, 0.5 , 2, 2); +} + +.label{ + -fx-all: unset; } \ No newline at end of file