fix tree items possibly getting the wrong foreground or background

diff --git a/ui_tree.go b/ui_tree.go
index 25c42af1b68a46b596de60888187cd04004e7770..9de145b96b2228d9c9bd6d7146780e58da5ffbf8 100644 (file)
--- a/ui_tree.go
+++ b/ui_tree.go
@@ -20,9 +20,7 @@ func (ti TreeItem) String() string {
        return ""
 }
 
-func (ti TreeItem) TreeItemStyle(active bool) (uiterm.Attribute, uiterm.Attribute) {
-       fg := uiterm.ColorDefault
-       bg := uiterm.ColorBlack
+func (ti TreeItem) TreeItemStyle(fg, bg uiterm.Attribute, active bool) (uiterm.Attribute, uiterm.Attribute) {
        if ti.Channel != nil {
                fg |= uiterm.AttrBold
        }

diff --git a/uiterm/tree.go b/uiterm/tree.go
index 7bac2ad170a19c413c8f353edf7fb9cb6877f074..0ac3fe0b57ba68ad337ee7bb1d94ef25f19047d1 100644 (file)
--- a/uiterm/tree.go
+++ b/uiterm/tree.go
@@ -7,7 +7,7 @@ import (
 )
 
 type TreeItem interface {
-       TreeItemStyle(active bool) (Attribute, Attribute)
+       TreeItemStyle(fg, bg Attribute, active bool) (Attribute, Attribute)
        String() string
 }
 
@@ -122,7 +122,7 @@ func (t *Tree) uiDraw() {
                        if reader != nil && level*2 <= dx {
                                if ch, _, err := reader.ReadRune(); err == nil {
                                        chr = ch
-                                       fg, bg = item.TreeItemStyle(t.active && t.activeLine == dy)
+                                       fg, bg = item.TreeItemStyle(fg, bg, t.active && t.activeLine == dy)
                                }
                        }
                        termbox.SetCell(x, y, chr, termbox.Attribute(fg), termbox.Attribute(bg))