aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/ui/MainFrame.java
diff options
context:
space:
mode:
authorcirakg <ciraboxkg@gmail.com>2023-01-15 19:31:41 +0100
committercirakg <ciraboxkg@gmail.com>2023-01-15 19:31:41 +0100
commit65c2dc33666ac35d5229018b604a8fd0e1f708a3 (patch)
treed20cd1bea61f5c52794c4a78ca6b56b589b68df3 /src/main/java/ui/MainFrame.java
parentda977ffa778d5bda4bba4d0f36db602ae1384b3c (diff)
Ispravljeno brisanje chat box-a izmedju igara. Dodat deo tooltip-a na game panel-u.
Diffstat (limited to 'src/main/java/ui/MainFrame.java')
-rw-r--r--src/main/java/ui/MainFrame.java7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/ui/MainFrame.java b/src/main/java/ui/MainFrame.java
index dc4b7f5..282ddde 100644
--- a/src/main/java/ui/MainFrame.java
+++ b/src/main/java/ui/MainFrame.java
@@ -139,6 +139,8 @@ public class MainFrame extends JFrame implements Runnable {
System.out.println("OPPONENTLEFT");
this.getContentPane().removeAll();
this.getContentPane().add(this.chooseOpponentPanel,BorderLayout.CENTER);
+ this.gamePanel.txtAreaChat.setText(null);//clear chat between games
+ this.gamePanel.chat="";
SwingUtilities.updateComponentTreeUI(this);
}else {
//XML OBJECTS
@@ -163,10 +165,7 @@ public class MainFrame extends JFrame implements Runnable {
this.getContentPane().add(this.gamePanel,BorderLayout.CENTER);
SwingUtilities.updateComponentTreeUI(this);
this.game=game;
- this.gamePanel.loadElements();
- this.gamePanel.txtAreaChat.setText(null);//clear chat between games
- this.gamePanel.chat="";
-
+ this.gamePanel.loadElements();
}
} catch (Exception e) {