From 1b2d4b3e16330e257484c71faf14b59087976e5f Mon Sep 17 00:00:00 2001 From: Seraina Date: Sun, 15 May 2022 13:04:48 +0200 Subject: [PATCH] Some design tweaks mainly of the chat --- .../client/gui/chat/ChatController.java | 9 +++++++-- .../client/gui/utils/ChatLabelConfigurator.java | 17 +++++++++++------ .../cs108/multiplayer/client/gui/chat/Chat.css | 4 +++- .../multiplayer/client/gui/chat/ChatView.fxml | 6 +++--- .../multiplayer/client/gui/game/GameDay.css | 10 ++++++++++ .../client/gui/lounge/boarderPane.css | 4 ++++ 6 files changed, 38 insertions(+), 12 deletions(-) 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 bb637a1..2c4ac6a 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 @@ -15,6 +15,7 @@ import javafx.beans.value.ObservableValue; import javafx.collections.ListChangeListener; import javafx.fxml.FXML; import javafx.fxml.Initializable; +import javafx.geometry.Pos; import javafx.scene.Group; import javafx.scene.Node; import javafx.scene.control.Button; @@ -185,9 +186,13 @@ public class ChatController implements Initializable { l.setWrapText(true); l.setMaxHeight(Double.MAX_VALUE); if (msg.contains("whispers")) { - l.setBackground(Background.fill(Color.SLATEBLUE)); + l.setBackground(Background.fill(Color.TRANSPARENT)); + l.setPrefWidth(1135); + l.setScaleShape(false); } else { - l.setBackground(Background.fill(Color.LIGHTSKYBLUE)); + l.setBackground(Background.fill(Color.TRANSPARENT)); + l.setPrefWidth(1135); + l.setScaleShape(false); } l.setTextFill(Color.BLACK); Platform.runLater(new Runnable() { 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 2dd3153..f2fa9fe 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 @@ -24,15 +24,20 @@ public class ChatLabelConfigurator { if (cmd.startsWith(whisper)) { //t = new Text("You whispered to " + whisperTargetSelectField.getText() + ": " + msg); l = new Label("You whispered to " + whisperTargetSelectField.getText() + ": " + msg); - l.setBackground(Background.fill(Color.LAVENDERBLUSH)); - } else { - //t = new Text(client.getUsername() + " (you): " + msg); - l = new Label(client.getUsername() + " (you): " + msg); - l.setBackground(Background.fill(Color.LAVENDER)); + l.setBackground(Background.fill(Color.TRANSPARENT)); l.setAlignment(Pos.CENTER_RIGHT); l.setWrapText(true); l.setMaxHeight(Double.MAX_VALUE); - l.setPrefWidth(1150); + l.setPrefWidth(1135); + l.setScaleShape(false); + } else { + //t = new Text(client.getUsername() + " (you): " + msg); + l = new Label(client.getUsername() + " (you): " + msg); + l.setBackground(Background.fill(Color.TRANSPARENT)); + l.setAlignment(Pos.CENTER_RIGHT); + l.setWrapText(true); + l.setMaxHeight(Double.MAX_VALUE); + l.setPrefWidth(1135); 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 34c1aaa..996b07e 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 @@ -1,4 +1,6 @@ -#ChatScrollPane{ + +.scroll-pane{ + -fx-background-color: transparent; } #vBoxChatMessages{ 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 8002e31..d0dc006 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 @@ -21,7 +21,7 @@ - + @@ -32,9 +32,9 @@ - + - + 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 82edb99..65a90d2 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 @@ -7,11 +7,21 @@ -fx-border-color: transparent; } +.button:pressed{ + -fx-background-color: transparent; + -fx-border-color: transparent; +} + #noiseButton{ -fx-background-color: midnightblue; -fx-text-fill: lightgrey; } +#noiseButton:pressed{ + -fx-background-color: midnightblue; + -fx-text-fill: lightgrey; +} + #roomButtonGroup{ -fx-background-color: transparent; } 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 c9b3d50..1b81fa8 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 @@ -21,3 +21,7 @@ .button:hover{ -fx-effect: innershadow(gaussian, lightsteelblue, 10, 0.5 , 2, 2); } + +*{ + -fx-background-color: transparent; +} \ No newline at end of file