diff options
| author | Caleb Bassi <calebjbassi@gmail.com> | 2018-02-21 11:15:53 -0800 |
|---|---|---|
| committer | Caleb Bassi <calebjbassi@gmail.com> | 2018-02-21 11:15:53 -0800 |
| commit | 8531e40b099cf2a0dc01f5cd2271d799b64a68f9 (patch) | |
| tree | d863fb0a2c88b0902bd8038222c500ee69ffddd5 | |
| parent | 88dbb6a45353e0bec2fcf60e1d49e4743eb50650 (diff) | |
Fixed colorschemes
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | colorschemes/default.go | 1 | ||||
| -rw-r--r-- | colorschemes/template.go | 2 | ||||
| -rw-r--r-- | gotop.go | 6 | ||||
| -rw-r--r-- | termui/list.go | 8 |
5 files changed, 12 insertions, 7 deletions
@@ -73,7 +73,7 @@ Feel free to add a new one. You can use 256 colors, bold, underline, and reverse * CPU Usage - support colors for more CPU cores * themes - - solarized picture and theme + - solarized picture - copy over vtop themes * general - command line option to set polling interval for CPU and mem diff --git a/colorschemes/default.go b/colorschemes/default.go index d96fb73..569f008 100644 --- a/colorschemes/default.go +++ b/colorschemes/default.go @@ -4,6 +4,7 @@ var DefaultCS = Colorscheme{ Name: "Default", Author: "Caleb Bassi", + Fg: 7, Bg: -1, BorderLabel: 7, diff --git a/colorschemes/template.go b/colorschemes/template.go index f2fcdbf..9551b51 100644 --- a/colorschemes/template.go +++ b/colorschemes/template.go @@ -20,6 +20,7 @@ type Colorscheme struct { Name string Author string + Fg int Bg int BorderLabel int @@ -36,6 +37,7 @@ type Colorscheme struct { DiskBar int + // Temperature colors depending on if it's over a certain threshold TempLow int TempHigh int } @@ -118,10 +118,12 @@ func keyBinds() { } func termuiColors() { - ui.Theme.Fg = ui.Color(7) + ui.Theme.Fg = ui.Color(colorscheme.Fg) ui.Theme.Bg = ui.Color(colorscheme.Bg) - ui.Theme.BorderBg = ui.Color(colorscheme.Bg) + ui.Theme.LabelFg = ui.Color(colorscheme.BorderLabel) ui.Theme.LabelBg = ui.Color(colorscheme.Bg) + ui.Theme.BorderFg = ui.Color(colorscheme.BorderLine) + ui.Theme.BorderBg = ui.Color(colorscheme.Bg) ui.Theme.TableCursor = ui.Color(colorscheme.ProcCursor) ui.Theme.Sparkline = ui.Color(colorscheme.Sparkline) diff --git a/termui/list.go b/termui/list.go index 27c0380..f011239 100644 --- a/termui/list.go +++ b/termui/list.go @@ -29,13 +29,13 @@ func (bc *List) Buffer() *Buffer { if y+1 > bc.Y { break } - bg := Theme.TempLow + fg := Theme.TempLow if bc.Data[y] >= bc.Threshold { - bg = Theme.TempHigh + fg = Theme.TempHigh } r := MaxString(text, (bc.X - 4)) - buf.SetString(1, y+1, r, Color(7), bc.Bg) - buf.SetString(bc.X-2, y+1, fmt.Sprintf("%dC", bc.Data[y]), bg, bc.Bg) + buf.SetString(1, y+1, r, Theme.Fg, bc.Bg) + buf.SetString(bc.X-2, y+1, fmt.Sprintf("%dC", bc.Data[y]), fg, bc.Bg) } return buf |