Use the right default FG colour in the treeview.

If there's no notification, we have to fallback to the treeview's
foreground colour instead of hardcoding black...

Closes #503

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/framemanager/tree/NodeLabel.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
@@ -30,22 +31,16 @@ import com.dmdirc.addons.ui_swing.textpane.StyledDocumentMaker;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameNameChangedEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
-import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.util.colours.Colour;
-
 import java.awt.Color;
 import java.awt.Font;
-
 import javax.swing.JPanel;
 import javax.swing.JTextPane;
 import javax.swing.UIManager;
 import javax.swing.text.DefaultStyledDocument;
 import javax.swing.text.StyledDocument;
-
-import net.miginfocom.swing.MigLayout;
-
 import net.engio.mbassy.listener.Handler;
+import net.miginfocom.swing.MigLayout;
 
 /**
  * Node label.
@@ -68,6 +63,8 @@ public class NodeLabel extends JPanel {
     private final JTextPane text = new JTextPane(new DefaultStyledDocument());
     /** Icon manager. */
     private final IconManager iconManager;
+    /** Default foreground colour when there are no notifications. */
+    private Color defaultForegroundColour;
     /** Current styled text. */
     private String currentText = "";
 
@@ -76,9 +73,10 @@ public class NodeLabel extends JPanel {
      *
      * @param window Window for this node
      */
-    public NodeLabel(final TextFrame window, final IconManager iconManager) {
+    public NodeLabel(final TextFrame window, final IconManager iconManager, final Color defaultForegroundColour) {
         this.window = window;
         this.iconManager = iconManager;
+        this.defaultForegroundColour = defaultForegroundColour;
 
         init();
     }
@@ -112,9 +110,8 @@ public class NodeLabel extends JPanel {
     }
 
     public void unreadStatusChanged(final UnreadStatusChangedEvent event) {
-        // TODO: Should this colour be configurable?
-        notificationColour = UIUtilities.convertColour(
-                event.getNotificationColour().orElse(Colour.BLACK));
+        notificationColour = event.getNotificationColour().map(UIUtilities::convertColour)
+                .orElse(defaultForegroundColour);
     }
 
     @Handler
@@ -167,6 +164,15 @@ public class NodeLabel extends JPanel {
         return notificationColour;
     }
 
+    /**
+     * Sets the default foreground colour to use when no notification is present.
+     *
+     * @param defaultForegroundColour The default colour to use.
+     */
+    public void setDefaultForegroundColour(Color defaultForegroundColour) {
+        this.defaultForegroundColour = defaultForegroundColour;
+    }
+
     @Override
     public Font getFont() {
         return UIManager.getFont("TextPane.font");

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -46,6 +46,7 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.LogUtils;
+import java.awt.Color;
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
@@ -212,7 +213,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
      */
     public void addWindow(final MutableTreeNode parent, final TextFrame window) {
         UIUtilities.invokeAndWait(() -> {
-            final NodeLabel label = new NodeLabel(window, iconManager);
+            final NodeLabel label = new NodeLabel(window, iconManager, getForegroundColour());
             eventBus.subscribe(label);
             swingEventBus.subscribe(label);
             final TreeViewNode node = new TreeViewNode(label, window);
@@ -231,11 +232,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
                 tree.scrollRectToVisible(new Rectangle(0, (int) view.getY(), 0, 0));
             }
 
-            node.getLabel().unreadStatusChanged(new UnreadStatusChangedEvent(
-                    window.getContainer(),
-                    window.getContainer().getUnreadStatusManager(),
-                    window.getContainer().getUnreadStatusManager().getNotificationColour(),
-                    window.getContainer().getUnreadStatusManager().getUnreadLines()));
+            refreshNodeLabel(window, node);
             node.getLabel().iconChanged(new FrameIconChangedEvent(window.getContainer(),
                     window.getContainer().getIcon()));
         });
@@ -273,14 +270,31 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
 
     /** Sets treeview colours. */
     private void setColours() {
+        final Color foregroundColour = getForegroundColour();
+        tree.setForeground(foregroundColour);
         tree.setBackground(UIUtilities.convertColour(colourManager.getColourFromString(
                         config.getOptionString("treeview", "backgroundcolour", "ui",
                                 "backgroundcolour"), null)));
-        tree.setForeground(UIUtilities.convertColour(colourManager.getColourFromString(
-                        config.getOptionString("treeview", "foregroundcolour", "ui",
-                                "foregroundcolour"), null)));
-
         tree.repaint();
+
+        nodes.entrySet().forEach(pair -> {
+            pair.getValue().getLabel().setDefaultForegroundColour(foregroundColour);
+            refreshNodeLabel(pair.getKey(), pair.getValue());
+        });
+    }
+
+    private Color getForegroundColour() {
+        return UIUtilities.convertColour(colourManager.getColourFromString(
+                config.getOptionString("treeview", "foregroundcolour", "ui",
+                        "foregroundcolour"), null));
+    }
+
+    private void refreshNodeLabel(TextFrame window, TreeViewNode node) {
+        node.getLabel().unreadStatusChanged(new UnreadStatusChangedEvent(
+                window.getContainer(),
+                window.getContainer().getUnreadStatusManager(),
+                window.getContainer().getUnreadStatusManager().getNotificationColour(),
+                window.getContainer().getUnreadStatusManager().getUnreadLines()));
     }
 
     @Override