move compact field header into widgets

grid.go

@@ -83,7 +83,7 @@ func (g *Grid) redrawRows() {
 	} else {
 		ui.Body.Y = 0
 	}
-	ui.Body.AddRows(fieldHeader())
+	ui.Body.AddRows(widgets.CompactHeader)
 	for _, c := range g.containers {
 		ui.Body.AddRows(c.widgets.Row())
 	}
@@ -117,26 +117,6 @@ func resizeIndicator() {
 	}
 }
 
-func fieldHeader() *ui.Row {
-	return ui.NewRow(
-		ui.NewCol(1, 0, headerPar("")),
-		ui.NewCol(2, 0, headerPar("NAME")),
-		ui.NewCol(2, 0, headerPar("CID")),
-		ui.NewCol(2, 0, headerPar("CPU")),
-		ui.NewCol(2, 0, headerPar("MEM")),
-		ui.NewCol(2, 0, headerPar("NET RX/TX")),
-	)
-}
-
-func headerPar(s string) *ui.Par {
-	p := ui.NewPar(fmt.Sprintf(" %s", s))
-	p.Border = false
-	p.Height = 2
-	p.Width = 20
-	p.TextFgColor = ui.ColorWhite
-	return p
-}
-
 func (g *Grid) ExpandView() {
 	ui.Clear()
 	ui.DefaultEvtStream.ResetHandlers()

menus.go

@@ -65,11 +65,6 @@ func SortMenu() {
 
 	// set cursor position to current sort field
 	m.SetCursor(config.GetVal("sortField"))
-	//for n, item := range m.Items {
-	//if item.Val == current {
-	//m.CursorPos = n
-	//}
-	//}
 
 	ui.Render(m)
 	m.NavigationHandlers()

widgets/compact.go

@@ -23,6 +23,15 @@ type ContainerWidgets interface {
 	SetMem(int64, int64, int)
 }
 
+var CompactHeader = ui.NewRow(
+	ui.NewCol(1, 0, slimPar("")),
+	ui.NewCol(2, 0, slimPar("NAME")),
+	ui.NewCol(2, 0, slimPar("CID")),
+	ui.NewCol(2, 0, slimPar("CPU")),
+	ui.NewCol(2, 0, slimPar("MEM")),
+	ui.NewCol(2, 0, slimPar("NET RX/TX")),
+)
+
 type Compact struct {
 	Status *ui.Par
 	Cid    *ui.Par