Improve icon picker and fix possible load bug

fyne-io · Oct 26, 2024 · c38244f · c38244f
1 parent b016f6d
commit c38244f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/internal/guidefs/widget.go b/internal/guidefs/widget.go
@@ -202,9 +202,9 @@ func initWidgets() {
 			Edit: func(obj fyne.CanvasObject, _ map[string]string, _ func([]*widget.FormItem)) []*widget.FormItem {
 				i := obj.(*widget.Icon)
 				return []*widget.FormItem{
-					widget.NewFormItem("Icon", widget.NewSelect(IconNames, func(selected string) {
-						i.SetResource(Icons[selected])
-					}))}
+					widget.NewFormItem("Icon", newIconSelectorButton(i.Resource, func(res fyne.Resource) {
+						i.SetResource(res)
+					}, true))}
 			},
 			Gostring: func(obj fyne.CanvasObject, props map[fyne.CanvasObject]map[string]string, defs map[string]string) string {
 				i := obj.(*widget.Icon)

diff --git a/pkg/gui/json.go b/pkg/gui/json.go
@@ -546,6 +546,10 @@ func decodeFields(e reflect.Value, in map[string]interface{}) error {
 			if res != nil {
 				f.Set(reflect.ValueOf(res))
 			}
+		case "fyne.ThemeSizeName":
+			if v != nil {
+				f.Set(reflect.ValueOf(fyne.ThemeSizeName(v.(string))))
+			}
 		case "[]*widget.AccordionItem":
 			var items []*widget.AccordionItem
 			for _, item := range reflect.ValueOf(v).Interface().([]interface{}) {