Handle unicode in colour parsing

Fixes #4270
fyne-io · Sep 27, 2023 · d35e57e · d35e57e
1 parent 912f47c
commit d35e57e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/theme/json.go b/theme/json.go
@@ -39,7 +39,7 @@ type hexColor string
 
 func (h hexColor) color() (color.Color, error) {
 	data := h
-	switch len(h) {
+	switch len([]rune(h)) {
 	case 8, 6:
 	case 9, 7: // remove # prefix
 		data = h[1:]

diff --git a/theme/json_test.go b/theme/json_test.go
@@ -28,6 +28,10 @@ func TestFromJSON(t *testing.T) {
 	assert.Equal(t, float32(5), th.Size(SizeNameInlineIcon))
 	assert.Equal(t, "NotoMono-Regular.ttf", th.Font(fyne.TextStyle{Monospace: true}).Name())
 	assert.Equal(t, "cancel_Paths.svg", th.Icon(IconNameCancel).Name())
+
+	th, _ = FromJSON("{\"Colors\":{\"foreground\":\"\xb1\"}}")
+	c := th.Color(ColorNameForeground, VariantLight)
+	assert.NotNil(t, c)
 }
 
 func TestFromTOML_Resource(t *testing.T) {