From 74ad6f48ed94557a66c525391b9f4df326508b58 Mon Sep 17 00:00:00 2001 From: jiepengtan Date: Thu, 15 Aug 2024 14:51:51 +0800 Subject: [PATCH] Add default values for the 'size' and 'color' attributes of the Monitor --- monitor.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/monitor.go b/monitor.go index 7662d5d8..95d5891a 100644 --- a/monitor.go +++ b/monitor.go @@ -27,6 +27,7 @@ import ( "github.com/goplus/spx/internal/gdi" xfont "github.com/goplus/spx/internal/gdi/font" + "github.com/goplus/spx/internal/tools" "github.com/hajimehoshi/ebiten/v2" "golang.org/x/image/font" ) @@ -65,9 +66,9 @@ func newMonitor(g reflect.Value, v specsp) (*Monitor, error) { target := v["target"].(string) val := v["val"].(string) name := v["name"].(string) - size := v["size"].(float64) - if size == 0 { - size = 1 + size := 1.0 + if v["size"] != nil { + size, _ = tools.GetFloat(v["size"]) } eval := buildMonitorEval(g, target, val) if eval == nil { @@ -76,7 +77,7 @@ func newMonitor(g reflect.Value, v specsp) (*Monitor, error) { mode := int(v["mode"].(float64)) color, err := parseColor(getSpcspVal(v, "color")) if err != nil { - panic(err) + color = Color{R: 0xff, G: 0xff, B: 0xff, A: 0xff} } label := v["label"].(string) x := v["x"].(float64)