From f404418040009635fcff461f304fe18079b69e1c Mon Sep 17 00:00:00 2001 From: Baaaaaz <131240480+Baaaaaz@users.noreply.github.com> Date: Fri, 3 Jul 2026 19:55:32 +0100 Subject: [PATCH 1/5] set chat notifications zOrder --- .../java/net/rptools/maptool/client/ui/MapToolFrame.java | 8 ++++++++ 1 file changed, 8 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 096f799622..ca5c405e57 100644 --- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java +++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java @@ -427,6 +427,10 @@ 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); @@ -1904,6 +1908,10 @@ 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 5d3fe7985cd2b24c07194b76530f722b32a88134 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 2/5] 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 ca5c405e57..096f799622 100644 --- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java +++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java @@ -427,10 +427,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); @@ -1908,10 +1904,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 710f7526301aa4a018258e1a83d331219a96c514 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 3/5] 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 096f799622..731320c064 100644 --- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java +++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java @@ -1678,8 +1678,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 d71f0cc704f2e2cfc77585313f0698ddb9a9ce19 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 4/5] 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 731320c064..937280fa32 100644 --- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java +++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java @@ -412,7 +412,6 @@ public MapToolFrame(JMenuBar menuBar) { currentRenderPanel = zoneRendererPanel; zoneRendererPanel.add(getChatTypingPanel(), PositionalLayout.Position.NW); - zoneRendererPanel.add(getChatActionLabel(), PositionalLayout.Position.SW); commandPanel = new CommandPanel(); @@ -424,6 +423,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 0220fb1e8a5e77758e19c2e238afdf7b35d987dd 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 5/5] 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 937280fa32..9599c4496b 100644 --- a/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java +++ b/src/main/java/net/rptools/maptool/client/ui/MapToolFrame.java @@ -1956,6 +1956,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; }