finished

kubakubakuba · May 22, 2023 · cd3db8f · cd3db8f
1 parent 9f36b6a
commit cd3db8f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/CodeNames/src/main/java/cz/cvut/fel/pjv/codenames/GUI/ChatView.java b/CodeNames/src/main/java/cz/cvut/fel/pjv/codenames/GUI/ChatView.java
@@ -21,7 +21,7 @@ public class ChatView extends Application {
     private Stage stage;
     private TextArea chatLog;
     private TextArea inputField;
-    private boolean enabled = false;
+    private boolean enabled = true;
     private ChatController chatControl;
     private Client localClient;
     private double xOffset = 0;
@@ -53,12 +53,16 @@ public void showChatWindow(String title) {
         inputField.setMaxHeight(28);
         inputField.setOnKeyPressed((event) -> {
             if (event.getCode() == KeyCode.ENTER) {
-                sendMessage();
+                if(enabled) {
+                    sendMessage();
+                }
             }
         });
         Button sendButton = new Button("Send");
         sendButton.setOnAction((ActionEvent e) -> {
-            sendMessage();
+            if(enabled) {
+                sendMessage();
+            }
         });
         VBox vbox = new VBox(4, msgLabel, chatLog, inputLabel, inputField, sendButton);
         vbox.setPadding(new Insets(8));
@@ -94,19 +98,20 @@ public void addMessage(String msg) {
      */
     public void enableChat(){
         enabled = true;
-        javafx.application.Platform.runLater(() -> {
+        /*javafx.application.Platform.runLater(() -> {
             inputField.setDisable(false);
-        });
+        });*/
     }
 
     /**
      * Disable chat
      */
     public void disableChat(){
         enabled = false;
-        javafx.application.Platform.runLater(() -> {
+        /*javafx.application.Platform.runLater(() -> {
+
             inputField.setDisable(true);
-        });
+        });*/
     }
 
     /**

diff --git a/CodeNames/src/main/java/cz/cvut/fel/pjv/codenames/GUI/GameView.java b/CodeNames/src/main/java/cz/cvut/fel/pjv/codenames/GUI/GameView.java
@@ -69,6 +69,7 @@ public void update(){
     @Override
     public void start(Stage primaryStage) {
         if(role == Player.PlayerRole.SPY_MASTER){
+            localControl.getChatController().setChatDisable();
             viewS.start(primaryStage);
         }
         if(role == Player.PlayerRole.FIELD_OPERATIVE){
@@ -92,6 +93,7 @@ public void gameEnd(){
         if(role == Player.PlayerRole.FIELD_OPERATIVE_LEADER){
             viewL.gameEnd();
         }
+        localControl.getChatController().setChatEnable();
     }
 
 }