Skip to content

Add borderColor attribute to widget_top #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pfsmorigo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add borderColor attribute to widget_top #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
1 change: 1 addition & 0 deletions decks/main.deck
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
[keys.widget.config]
mode = "cpu"
fillColor = "#d497de"
borderColor = "#ffffff"

[[keys]]
index = 1
Expand Down
26 changes: 16 additions & 10 deletions widget_top.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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,
}
}

Expand Down Expand Up @@ -79,14 +82,17 @@ 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
img := image.NewRGBA(image.Rect(0, 0, size, size))

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),
Expand Down