Merge pull request #6009 from Baaaaaz/bug/6006-overlays-do-not-display

Fix ChatTypingPanel and ChatActionLabel notifications not displaying Take 2

Author: kwvanderlinde

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,13 +422,12 @@ 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);
 
-    // bring chat notifications to the front
-    zoneRendererPanel.setComponentZOrder(getChatTypingPanel(), 0);
-    zoneRendererPanel.setComponentZOrder(getChatActionLabel(), 0);
-
     // Put it all together
     setJMenuBar(menuBar);
     add(BorderLayout.NORTH, toolbarPanel);
@@ -1707,8 +1705,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;
@@ -1933,10 +1930,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();
@@ -1988,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;
   }