From 55980ab30d7bea2c16e113ce7bde9e1b98953a7c Mon Sep 17 00:00:00 2001
From: Baaaaaz <131240480+Baaaaaz@users.noreply.github.com>
Date: Sat, 11 Jul 2026 06:50:48 +0100
Subject: [PATCH 1/4] remove chat notifications z-ordering changes made in 5999

---
 .../java/net/rptools/maptool/client/ui/MapToolFrame.java  | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
index 286cfe0b70..0e9edc1d15 100644
--- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
+++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
@@ -426,10 +426,6 @@ public MapToolFrame(JMenuBar menuBar) {
     pointerToolOverlay = new PointerToolOverlay();
     zoneRendererPanel.add(pointerToolOverlay, PositionalLayout.Position.CENTER, 0);
 
-    // bring chat notifications to the front
-    zoneRendererPanel.setComponentZOrder(getChatTypingPanel(), 0);
-    zoneRendererPanel.setComponentZOrder(getChatActionLabel(), 0);
-
     // Put it all together
     setJMenuBar(menuBar);
     add(BorderLayout.NORTH, toolbarPanel);
@@ -1933,10 +1929,6 @@ public void showFullScreenTools() {
     zoneRendererPanel.add(initiativePanel, PositionalLayout.Position.SE);
     zoneRendererPanel.setComponentZOrder(initiativePanel, 0);
 
-    // bring chat notifications to the front
-    zoneRendererPanel.setComponentZOrder(getChatTypingPanel(), 0);
-    zoneRendererPanel.setComponentZOrder(getChatActionLabel(), 0);
-
     zoneRendererPanel.revalidate();
     zoneRendererPanel.doLayout();
     zoneRendererPanel.repaint();

From a8c32955bfc454c3a1ce2f8ffcd7affc1807c0f5 Mon Sep 17 00:00:00 2001
From: Baaaaaz <131240480+Baaaaaz@users.noreply.github.com>
Date: Sat, 11 Jul 2026 09:10:59 +0100
Subject: [PATCH 2/4] remove explicit stacking position when adding
 zoneRendererPanel

---
 src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
index 0e9edc1d15..ef207e200e 100644
--- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
+++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
@@ -1703,8 +1703,7 @@ public void setCurrentZoneRenderer(ZoneRenderer renderer) {
       zoneRendererPanel.remove(currentRenderer);
     }
     if (renderer != null) {
-      zoneRendererPanel.add(
-          renderer, PositionalLayout.Position.CENTER, zoneRendererPanel.getComponentCount() - 2);
+      zoneRendererPanel.add(renderer, PositionalLayout.Position.CENTER);
       zoneRendererPanel.doLayout();
     }
     currentRenderer = renderer;

From 24013e8f5184e9e7a69520982d931248bf4934a7 Mon Sep 17 00:00:00 2001
From: Baaaaaz <131240480+Baaaaaz@users.noreply.github.com>
Date: Sat, 11 Jul 2026 09:37:31 +0100
Subject: [PATCH 3/4] adjust Chat Action Label stack position

---
 src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
index ef207e200e..a4f8582cd3 100644
--- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
+++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
@@ -411,7 +411,6 @@ public MapToolFrame(JMenuBar menuBar) {
     currentRenderPanel = zoneRendererPanel;
 
     zoneRendererPanel.add(getChatTypingPanel(), PositionalLayout.Position.NW);
-    zoneRendererPanel.add(getChatActionLabel(), PositionalLayout.Position.SW);
 
     commandPanel = new CommandPanel();
 
@@ -423,6 +422,9 @@ public MapToolFrame(JMenuBar menuBar) {
     zoneRendererPanel.add(overlayPanel, PositionalLayout.Position.CENTER, 0);
     overlayPanel.setVisible(false); // disabled by default
 
+    // chat action label should be above overlays, otherwise unclickable when overlays visible
+    zoneRendererPanel.add(getChatActionLabel(), PositionalLayout.Position.SW, 0);
+
     pointerToolOverlay = new PointerToolOverlay();
     zoneRendererPanel.add(pointerToolOverlay, PositionalLayout.Position.CENTER, 0);
 

From f2669b516ab6c166cc17703c6311fece4e618e4c Mon Sep 17 00:00:00 2001
From: Baaaaaz <131240480+Baaaaaz@users.noreply.github.com>
Date: Sat, 11 Jul 2026 09:38:54 +0100
Subject: [PATCH 4/4] manage Chat Action Label visibility when exiting full
 screen mode

---
 .../java/net/rptools/maptool/client/ui/MapToolFrame.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
index a4f8582cd3..7932cec2f3 100644
--- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
+++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java
@@ -1981,6 +1981,11 @@ public void showWindowed() {
     menuBar.setVisible(true);
     this.setVisible(true);
 
+    // hide the chat action label if the chat window is already visible in windowed mode
+    if (chatActionLabel.isShowing() && isCommandPanelVisible()) {
+      chatActionLabel.setVisible(false);
+    }
+
     fullScreenFrame.dispose();
     fullScreenFrame = null;
   }