diff --git a/README.md b/README.md index 7c86da7..0238340 100644 --- a/README.md +++ b/README.md @@ -244,6 +244,7 @@ This widget shows the current CPU or memory utilization as a bar graph. mode = "cpu" color = "#fefefe" # optional fillColor = "#d497de" # optional + borderColor = "#ffffff" # optional ``` There are two values for `mode`: `cpu` and `memory`. diff --git a/decks/main.deck b/decks/main.deck index 3675a49..49b4805 100644 --- a/decks/main.deck +++ b/decks/main.deck @@ -5,6 +5,7 @@ [keys.widget.config] mode = "cpu" fillColor = "#d497de" + borderColor = "#ffffff" [[keys]] index = 1 diff --git a/widget_top.go b/widget_top.go index 0b377cf..fefa3cb 100644 --- a/widget_top.go +++ b/widget_top.go @@ -16,11 +16,12 @@ import ( type TopWidget struct { *BaseWidget - mode string - color color.Color - fillColor color.Color + mode string + color color.Color + fillColor color.Color + borderColor color.Color - lastValue float64 + lastValue float64 } // NewTopWidget returns a new TopWidget. @@ -29,15 +30,17 @@ func NewTopWidget(bw *BaseWidget, opts WidgetConfig) *TopWidget { var mode string _ = ConfigValue(opts.Config["mode"], &mode) - var color, fillColor color.Color + var color, fillColor, borderColor color.Color _ = ConfigValue(opts.Config["color"], &color) _ = ConfigValue(opts.Config["fillColor"], &fillColor) + _ = ConfigValue(opts.Config["borderColor"], &borderColor) return &TopWidget{ - BaseWidget: bw, - mode: mode, - color: color, - fillColor: fillColor, + BaseWidget: bw, + mode: mode, + color: color, + fillColor: fillColor, + borderColor: borderColor, } } @@ -79,6 +82,9 @@ func (w *TopWidget) Update() error { if w.fillColor == nil { w.fillColor = color.RGBA{166, 155, 182, 255} } + if w.borderColor == nil { + w.borderColor = DefaultColor + } size := int(w.dev.Pixels) margin := size / 18 @@ -86,7 +92,7 @@ func (w *TopWidget) Update() error { draw.Draw(img, image.Rect(12, 6, size-12, size-18), - &image.Uniform{w.color}, + &image.Uniform{w.borderColor}, image.Point{}, draw.Src) draw.Draw(img, image.Rect(13, 7, size-14, size-20),