From 4aaf26b63df05f054e8278b2e618e3ad29feae19 Mon Sep 17 00:00:00 2001
From: Bradley Cicenas <bradley@vektor.nyc>
Date: Sun, 26 Feb 2017 21:23:56 +0000
Subject: [PATCH] add common column width calculation method, global column
 spacing

---
 widgets/compact.go | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/widgets/compact.go b/widgets/compact.go
index 0db1900..7dbc60c 100644
--- a/widgets/compact.go
+++ b/widgets/compact.go
@@ -11,8 +11,10 @@ import (
 var log = logging.Init()
 
 const (
-	mark = string('\u25C9')
-	vBar = string('\u25AE')
+	mark        = string('\u25C9')
+	vBar        = string('\u25AE')
+	colSpacing  = 1
+	statusWidth = 3
 )
 
 type CompactGrid struct {
@@ -85,10 +87,15 @@ func NewCompactHeader() *CompactHeader {
 	return header
 }
 
+// Calculate per-column width, given total width and number of items
+func calcWidth(width, items int) int {
+	spacing := colSpacing * items
+	return (width - statusWidth - spacing) / items
+}
+
 func (c *CompactHeader) SetWidth(w int) {
 	x := 1
-	statusWidth := 3
-	autoWidth := (w - statusWidth) / 5
+	autoWidth := calcWidth(w, 5)
 	for n, col := range c.pars {
 		if n == 0 {
 			col.SetX(x)
@@ -98,7 +105,7 @@ func (c *CompactHeader) SetWidth(w int) {
 		}
 		col.SetX(x)
 		col.SetWidth(autoWidth)
-		x += autoWidth
+		x += autoWidth + colSpacing
 	}
 }
 
@@ -162,8 +169,7 @@ func (w *Compact) SetY(y int) {
 
 func (w *Compact) SetWidth(width int) {
 	x := 1
-	statusWidth := 3
-	autoWidth := (width - statusWidth) / 5
+	autoWidth := calcWidth(width, 5)
 	for n, col := range w.all() {
 		if n == 0 {
 			col.SetX(x)
@@ -173,7 +179,7 @@ func (w *Compact) SetWidth(width int) {
 		}
 		col.SetX(x)
 		col.SetWidth(autoWidth)
-		x += autoWidth
+		x += autoWidth + colSpacing
 	}
 }
 
@@ -287,6 +293,5 @@ func slimGauge() *ui.Gauge {
 	g.PaddingBottom = 0
 	g.BarColor = ui.ColorGreen
 	g.Label = "-"
-	g.Bg = ui.ColorBlack
 	return g
 }