From a4b755002d8e47035b1746ecbf06e527907848b2 Mon Sep 17 00:00:00 2001
From: Andy Williams <andy@andy.xyz>
Date: Wed, 31 Jul 2024 21:54:01 +0100
Subject: [PATCH] Fix the Go code generation for pseudo-containers

---
 pkg/gui/go.go | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/pkg/gui/go.go b/pkg/gui/go.go
index 8ca0338..668b820 100644
--- a/pkg/gui/go.go
+++ b/pkg/gui/go.go
@@ -99,10 +99,6 @@ func (g *gui) makeUI() fyne.CanvasObject {
 }
 
 func packagesRequired(obj fyne.CanvasObject, meta map[fyne.CanvasObject]map[string]string) []string {
-	if w, ok := obj.(fyne.Widget); ok {
-		return packagesRequiredForWidget(w)
-	}
-
 	ret := []string{"container"}
 	var objs []fyne.CanvasObject
 	if c, ok := obj.(*fyne.Container); ok {
@@ -111,9 +107,19 @@ func packagesRequired(obj fyne.CanvasObject, meta map[fyne.CanvasObject]map[stri
 		if ok && layout == "Form" {
 			ret = append(ret, "layout")
 		}
-	} else if c, ok := obj.(*fyne.Container); ok {
-		objs = c.Objects
+	} else {
+		class := reflect.TypeOf(obj).String()
+		info, ok := guidefs.Widgets[class]
+
+		if ok && info.IsContainer() {
+			objs = info.Children(obj)
+		} else {
+			if w, ok := obj.(fyne.Widget); ok {
+				return packagesRequiredForWidget(w)
+			}
+		}
 	}
+
 	for _, w := range objs {
 		for _, p := range packagesRequired(w, meta) {
 			added := false
@@ -142,14 +148,6 @@ func packagesRequiredForWidget(w fyne.Widget) []string {
 
 func varsRequired(obj fyne.CanvasObject, props map[fyne.CanvasObject]map[string]string) []string {
 	name := props[obj]["name"]
-	if w, ok := obj.(fyne.Widget); ok {
-		if name == "" {
-			return []string{}
-		}
-
-		_, class := getTypeOf(w)
-		return []string{name + " " + class}
-	}
 
 	var ret []string
 	if c, ok := obj.(*fyne.Container); ok {
@@ -160,6 +158,22 @@ func varsRequired(obj fyne.CanvasObject, props map[fyne.CanvasObject]map[string]
 		for _, w := range c.Objects {
 			ret = append(ret, varsRequired(w, props)...)
 		}
+	} else {
+		class := reflect.TypeOf(obj).String()
+		info, ok := guidefs.Widgets[class]
+
+		if ok && info.IsContainer() {
+			for _, child := range info.Children(obj) {
+				ret = append(ret, varsRequired(child, props)...)
+			}
+		}
+	}
+
+	if w, ok := obj.(fyne.Widget); ok {
+		if name != "" {
+			_, class := getTypeOf(w)
+			ret = append(ret, name+" "+class)
+		}
 	}
 	return ret
 }