Small code cleanups

muesli · muesli · commit 3d415b02db21 · 2021-06-11T00:59:10.000+02:00
diff --git a/widget.go b/widget.go
@@ -16,6 +16,7 @@ import (
 )
 
 var (
+	// DefaultColor is the standard color for text rendering.
 	DefaultColor = color.RGBA{255, 255, 255, 255}
 )
 
@@ -174,7 +175,7 @@ func loadThemeImage(theme string, img string) (image.Image, error) {
 
 func flattenImage(img image.Image, clr color.Color) image.Image {
 	bounds := img.Bounds()
-	flatten := image.NewRGBA(image.Rect(0, 0, bounds.Dx(), bounds.Dy()))
+	flatten := image.NewRGBA(bounds)
 	draw.Draw(flatten, flatten.Bounds(), img, image.Point{}, draw.Src)
 	alphaThreshold := uint32(20000)
 
@@ -188,6 +189,7 @@ func flattenImage(img image.Image, clr color.Color) image.Image {
 			}
 		}
 	}
+
 	return flatten
 }
 
diff --git a/widget_button.go b/widget_button.go
@@ -44,12 +44,15 @@ func NewButtonWidget(bw *BaseWidget, opts WidgetConfig) (*ButtonWidget, error) {
 		flatten:    flatten,
 	}
 	if icon != "" {
-		w.LoadImage(icon)
+		if err := w.LoadImage(icon); err != nil {
+			return nil, err
+		}
 	}
 
 	return w, nil
 }
 
+// LoadImage loads an image from disk.
 func (w *ButtonWidget) LoadImage(path string) error {
 	path, err := expandPath(w.base, path)
 	if err != nil {
@@ -64,6 +67,7 @@ func (w *ButtonWidget) LoadImage(path string) error {
 	return nil
 }
 
+// SetImage updates the widget's icon.
 func (w *ButtonWidget) SetImage(img image.Image) {
 	w.icon = img
 	if w.flatten {
diff --git a/widget_weather.go b/widget_weather.go
@@ -5,7 +5,6 @@ import (
 	"embed"
 	"fmt"
 	"image"
-	"image/color"
 	"io/ioutil"
 	"log"
 	"net/http"
@@ -38,10 +37,8 @@ func weatherImage(name string) image.Image {
 type WeatherWidget struct {
 	*ButtonWidget
 
-	data    WeatherData
-	color   color.Color
-	theme   string
-	flatten bool
+	data  WeatherData
+	theme string
 }
 
 // WeatherData handles fetches and parsing weather data.

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ import (`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`var (`
	`19`	`+ // DefaultColor is the standard color for text rendering.`
`19`	`20`	`DefaultColor = color.RGBA{255, 255, 255, 255}`
`20`	`21`	`)`
`21`	`22`
`@@ -174,7 +175,7 @@ func loadThemeImage(theme string, img string) (image.Image, error) {`
`174`	`175`
`175`	`176`	`func flattenImage(img image.Image, clr color.Color) image.Image {`
`176`	`177`	`bounds := img.Bounds()`
`177`		`- flatten := image.NewRGBA(image.Rect(0, 0, bounds.Dx(), bounds.Dy()))`
	`178`	`+ flatten := image.NewRGBA(bounds)`
`178`	`179`	`draw.Draw(flatten, flatten.Bounds(), img, image.Point{}, draw.Src)`
`179`	`180`	`alphaThreshold := uint32(20000)`
`180`	`181`
`@@ -188,6 +189,7 @@ func flattenImage(img image.Image, clr color.Color) image.Image {`
`188`	`189`	`}`
`189`	`190`	`}`
`190`	`191`	`}`
	`192`	`+`
`191`	`193`	`return flatten`
`192`	`194`	`}`
`193`	`195`
Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,15 @@ func NewButtonWidget(bw BaseWidget, opts WidgetConfig) (ButtonWidget, error) {`
`44`	`44`	`flatten: flatten,`
`45`	`45`	`}`
`46`	`46`	`if icon != "" {`
`47`		`- w.LoadImage(icon)`
	`47`	`+ if err := w.LoadImage(icon); err != nil {`
	`48`	`+ return nil, err`
	`49`	`+ }`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`return w, nil`
`51`	`53`	`}`
`52`	`54`
	`55`	`+// LoadImage loads an image from disk.`
`53`	`56`	`func (w *ButtonWidget) LoadImage(path string) error {`
`54`	`57`	`path, err := expandPath(w.base, path)`
`55`	`58`	`if err != nil {`
`@@ -64,6 +67,7 @@ func (w *ButtonWidget) LoadImage(path string) error {`
`64`	`67`	`return nil`
`65`	`68`	`}`
`66`	`69`
	`70`	`+// SetImage updates the widget's icon.`
`67`	`71`	`func (w *ButtonWidget) SetImage(img image.Image) {`
`68`	`72`	`w.icon = img`
`69`	`73`	`if w.flatten {`