diff --git a/widgets/compact.go b/widgets/compact.go index b4acdd1..755aefe 100644 --- a/widgets/compact.go +++ b/widgets/compact.go @@ -27,9 +27,9 @@ type Compact struct { func NewCompact(id string, name string) *Compact { return &Compact{ - Cid: compactPar(id), - Net: compactPar("-"), - Name: compactPar(name), + Cid: slimPar(id), + Net: slimPar("-"), + Name: slimPar(name), Cpu: slimGauge(), Memory: slimGauge(), } @@ -83,6 +83,15 @@ func (w *Compact) SetMem(val int64, limit int64, percent int) { w.Memory.Percent = percent } +func slimPar(s string) *ui.Par { + p := ui.NewPar(s) + p.Border = false + p.Height = 1 + p.Width = 20 + p.TextFgColor = ui.ColorWhite + return p +} + func slimGauge() *ui.Gauge { g := ui.NewGauge() g.Height = 1 diff --git a/widgets/util.go b/widgets/util.go index d7c7af9..2397fa1 100644 --- a/widgets/util.go +++ b/widgets/util.go @@ -34,15 +34,6 @@ func byteFormat(n int64) string { return fmt.Sprintf("%sG", strconv.FormatInt(n, 10)) } -func compactPar(s string) *ui.Par { - p := ui.NewPar(s) - p.Border = false - p.Height = 1 - p.Width = 20 - p.TextFgColor = ui.ColorWhite - return p -} - func colorScale(n int) ui.Attribute { if n > 70 { return ui.ColorRed