diff --git a/wtf/bargraph.go b/wtf/bargraph.go index 7a1a5e9e..71af1f98 100644 --- a/wtf/bargraph.go +++ b/wtf/bargraph.go @@ -89,9 +89,9 @@ func (widget *BarGraph) UpdateRefreshedAt() { func (widget *BarGraph) addView() { view := tview.NewTextView() - view.SetBackgroundColor(ColorFor(Config.UString("wtf.colors.background", "black"))) + view.SetBackgroundColor(colorFor(Config.UString("wtf.colors.background", "black"))) view.SetBorder(true) - view.SetBorderColor(ColorFor(widget.BorderColor())) + view.SetBorderColor(colorFor(widget.BorderColor())) view.SetDynamicColors(true) view.SetTitle(widget.Name) view.SetWrap(false) diff --git a/wtf/colors.go b/wtf/colors.go index 0686d517..938178f2 100644 --- a/wtf/colors.go +++ b/wtf/colors.go @@ -420,7 +420,9 @@ func ASCIItoTviewColors(text string) string { text, replaceWithHexColorString), `[::b]`), `[-]`) } -func ColorFor(label string) tcell.Color { +/* -------------------- Unexported Functions -------------------- */ + +func colorFor(label string) tcell.Color { if _, ok := colors[label]; ok { return colors[label] } else { @@ -428,8 +430,6 @@ func ColorFor(label string) tcell.Color { } } -/* -------------------- Unexported Functions -------------------- */ - func replaceWithHexColorString(substring string) string { colorID, err := strconv.Atoi(substring[7 : len(substring)-1]) if err != nil { diff --git a/wtf/display.go b/wtf/display.go index d24cacf4..bea5d582 100644 --- a/wtf/display.go +++ b/wtf/display.go @@ -14,11 +14,7 @@ func NewDisplay(widgets []Wtfable) *Display { } display.build(widgets) - display.Grid.SetBackgroundColor( - ColorFor( - Config.UString("wtf.colors.background", "black"), - ), - ) + display.Grid.SetBackgroundColor(colorFor(Config.UString("wtf.colors.background", "black"))) return &display } diff --git a/wtf/focus_tracker.go b/wtf/focus_tracker.go index 596affef..87f6c5a0 100644 --- a/wtf/focus_tracker.go +++ b/wtf/focus_tracker.go @@ -70,7 +70,7 @@ func (tracker *FocusTracker) blur(idx int) { view := widget.TextView() view.Blur() - view.SetBorderColor(ColorFor(widget.BorderColor())) + view.SetBorderColor(colorFor(widget.BorderColor())) } func (tracker *FocusTracker) decrement() { @@ -90,7 +90,7 @@ func (tracker *FocusTracker) focus(idx int) { view := widget.TextView() tracker.App.SetFocus(view) - view.SetBorderColor(ColorFor(Config.UString("wtf.colors.border.focused", "gray"))) + view.SetBorderColor(colorFor(Config.UString("wtf.colors.border.focused", "gray"))) } func (tracker *FocusTracker) focusables() []Wtfable { diff --git a/wtf/text_widget.go b/wtf/text_widget.go index c1bef129..ea0b5ac9 100644 --- a/wtf/text_widget.go +++ b/wtf/text_widget.go @@ -82,9 +82,9 @@ func (widget *TextWidget) TextView() *tview.TextView { func (widget *TextWidget) addView() { view := tview.NewTextView() - view.SetBackgroundColor(ColorFor(Config.UString("wtf.colors.background", "black"))) + view.SetBackgroundColor(colorFor(Config.UString("wtf.colors.background", "black"))) view.SetBorder(true) - view.SetBorderColor(ColorFor(widget.BorderColor())) + view.SetBorderColor(colorFor(widget.BorderColor())) view.SetDynamicColors(true) view.SetTitle(widget.Name) view.SetWrap(false) diff --git a/wtftests/colors_test.go b/wtftests/colors_test.go deleted file mode 100644 index 79344ebd..00000000 --- a/wtftests/colors_test.go +++ /dev/null @@ -1,14 +0,0 @@ -package wtftests - -import ( - "testing" - - "github.com/gdamore/tcell" - . "github.com/senorprogrammer/wtf/wtf" - . "github.com/stretchr/testify/assert" -) - -func TestColorFor(t *testing.T) { - Equal(t, tcell.ColorRed, ColorFor("red")) - Equal(t, tcell.ColorGreen, ColorFor("cat")) -}