Merge branch 'master' into zendesk_module

wtfutil · Jul 26, 2018 · cc74845 · cc74845
2 parents ea8148a + 66868a3
commit cc74845
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 28 deletions.
diff --git 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
@@ -420,16 +420,16 @@ 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 {
 		return tcell.ColorGreen
 	}
 }
 
-/* -------------------- 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
@@ -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
@@ -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
@@ -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