diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/LobbyListView.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/LobbyListView.java new file mode 100644 index 0000000..f893e07 --- /dev/null +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/LobbyListView.java @@ -0,0 +1,5 @@ +package ch.unibas.dmi.dbis.cs108.multiplayer.client.gui; + +public class LobbyListView { + +} diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java index 8b04c5a..84e7947 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatApp.java @@ -84,7 +84,7 @@ public class ChatApp extends Application { public void start(Stage primaryStage) throws Exception { this.setcModel(clientModel); URL resource = ChatApp.class.getResource( - "splitPaneChatView.fxml"); + "ChatView.fxml"); if (resource == null) { System.out.println("File wasnt found"); } @@ -92,7 +92,7 @@ public class ChatApp extends Application { try { Parent root = FXMLLoader.load( Objects.requireNonNull(ChatApp.class.getResource( - "splitPaneChatView.fxml"))); + "ChatView.fxml"))); // TODO bin chatController.getChatPaneRoot() border to root border for rezising Scene scene = new Scene(root); scene.setRoot(root); 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 055f5b2..c1664d0 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 @@ -22,6 +22,7 @@ import javafx.scene.control.SplitPane; import javafx.scene.control.TextArea; import javafx.scene.control.TextField; import javafx.scene.layout.Background; +import javafx.scene.layout.Pane; import javafx.scene.layout.VBox; import javafx.scene.paint.Color; import org.apache.logging.log4j.LogManager; @@ -33,7 +34,9 @@ public class ChatController implements Initializable { public static final BudaLogConfig l = new BudaLogConfig(LOGGER); @FXML - private SplitPane chatPaneRoot; + private VBox vBoxServerMessage; + @FXML + private Pane chatPaneRoot; @FXML private VBox vBoxChatMessages; @FXML @@ -41,7 +44,7 @@ public class ChatController implements Initializable { @FXML private TextField whisperTargetSelectField; @FXML - private TextArea chatMsgField; + private TextField chatMsgField; private static ClientModel client; @@ -171,7 +174,7 @@ public class ChatController implements Initializable { this.client = client; } - public SplitPane getChatPaneRoot() { + public Pane getChatPaneRoot() { return chatPaneRoot; } diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/LobbyListView.fxml b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/LobbyListView.fxml new file mode 100644 index 0000000..66ab9bb --- /dev/null +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/LobbyListView.fxml @@ -0,0 +1,14 @@ + + + + + + + + + + + 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 new file mode 100644 index 0000000..0ee721d --- /dev/null +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatView.fxml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +