From 8531e40b099cf2a0dc01f5cd2271d799b64a68f9 Mon Sep 17 00:00:00 2001
From: Caleb Bassi <calebjbassi@gmail.com>
Date: Wed, 21 Feb 2018 11:15:53 -0800
Subject: [PATCH] Fixed colorschemes

---
 README.md                | 2 +-
 colorschemes/default.go  | 1 +
 colorschemes/template.go | 2 ++
 gotop.go                 | 6 ++++--
 termui/list.go           | 8 ++++----
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 79b450d..7929e13 100644
--- a/README.md
+++ b/README.md
@@ -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
 }
diff --git a/gotop.go b/gotop.go
index c6608c9..4e096fe 100644
--- a/gotop.go
+++ b/gotop.go
@@ -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