taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into zendesk_module

Browse Source
This commit is contained in:
Chris Cummer 2018-07-26 16:52:02 -04:00 committed by GitHub
commit cc74845d6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wtf/bargraph.go
View File

@ -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)

6
wtf/colors.go
View File

@ -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 {

6
wtf/display.go
View File

@ -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
}

4
wtf/focus_tracker.go
View File

@ -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 {

4
wtf/text_widget.go
View File

@ -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)

14
wtftests/colors_test.go
View File

@ -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"))
}