From b769991c3663264bb5738b584fe0a3beb2738fc9 Mon Sep 17 00:00:00 2001 From: Sebastian Lenzlinger Date: Thu, 28 Apr 2022 13:41:45 +0200 Subject: [PATCH] Minor Changes to ChatController adding a TODO and created a LobbyListItem class to represent members of the lobby list view, or at least the data therein. --- .../client/gui/chat/ChatController.java | 7 ++++++- .../client/gui/lounge/LobbyListItem.java | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyListItem.java 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 ec9b1fe..aacdf11 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 @@ -32,6 +32,7 @@ import javafx.scene.layout.GridPane; import javafx.scene.layout.Pane; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; +import javafx.scene.text.Text; import javafx.scene.text.TextFlow; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -117,7 +118,7 @@ public class ChatController implements Initializable { public void changed(ObservableValue observable, Number oldValue, Number newValue) { vBoxChatMessages.setMaxHeight(newValue.doubleValue()); - ChatScrollPane.setMaxHeight(newValue.doubleValue()*2); + ChatScrollPane.setMaxHeight(newValue.doubleValue() * 2); } }); /** @@ -163,16 +164,20 @@ public class ChatController implements Initializable { }); } + //TODO figure out if to use Text or Label & how to make wrapping work finally @Sebastian private void sendChatMsg() { String msg = chatMsgField.getText();//.split("\\R")[0]; //cut off extra lines, if present. if (!msg.isEmpty()) { client.getClient().sendMsgToServer(cmd.toString() + msg); LOGGER.info("Message trying to send is: " + cmd.toString() + msg); + Text t; Label l; 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.setWrapText(true); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyListItem.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyListItem.java new file mode 100644 index 0000000..4793b9c --- /dev/null +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LobbyListItem.java @@ -0,0 +1,14 @@ +package ch.unibas.dmi.dbis.cs108.multiplayer.client.gui.lounge; + +import java.util.List; +import javafx.scene.control.Label; +import javafx.scene.control.ToggleButton; + +public class LobbyListItem { + + private Label lobbyID; + private Label adminName; + private List clientInLobby; + private ToggleButton button; + +}