1 files changed, 48 insertions, 18 deletions

diff --git a/toolkit/andlabs/label.go b/toolkit/andlabs/label.go
index c5a6896..e990b42 100644
--- a/toolkit/andlabs/label.go
+++ b/toolkit/andlabs/label.go
@@ -1,42 +1,72 @@
 package main
 
-import "log"
+import (
+	"github.com/andlabs/ui"
+	_ "github.com/andlabs/ui/winmanifest"
 
-import "github.com/andlabs/ui"
-import _ "github.com/andlabs/ui/winmanifest"
+	"git.wit.org/wit/gui/toolkit"
+)
 
-import "git.wit.org/wit/gui/toolkit"
+var pwLabel *toolkit.Widget
+var wLabel *toolkit.Widget
+var tmpNewt *andlabsT
 
 func NewLabel(parentW *toolkit.Widget, w *toolkit.Widget) {
+	pwLabel = parentW
+	wLabel = w
+	tmpNewt = new(andlabsT)
+	tmpNewt.Width = 10
+	log(debugToolkit, "mapWidgets in ui.QueueMain() START newt =", tmpNewt.Width, tmpNewt)
+	if (tmpNewt == nil) {
+		log(debugToolkit, "mapWidgets WHY THE HELL IS THIS NIL?", tmpNewt.Width, tmpNewt)
+	}
+	ui.QueueMain(newLabel)
+
+	log(true, "sleep(.2) HACK. TODO: wrap spinlock around andlabs.ui goroutine")
+	// log(true, "sleep(.2) HACK. TODO: verify newLabel() is running inside andlabs/ui goroutine") // verified that worked
+	sleep(.2)
+	log(debugToolkit, "mapWidgets parentW/wLabel =", pwLabel)
+	log(debugToolkit, "mapWidgets new/newt =", tmpNewt)
+	mapWidgetsToolkits(w, tmpNewt)
+
+	/*
+	t := mapToolkits[parentW]
+	if (t == nil) {
+		log(debugToolkit, "go.andlabs.NewDropdown() toolkit struct == nil. name=", parentW.Name, w.Name)
+		listMap()
+	}
+	newt := t.NewDropdown(w.Name)
+	mapWidgetsToolkits(w, newt)
+	*/
+}
+
+func newLabel() {
 	var t, newt *andlabsT
-	log.Println("gui.andlabs.NewButton()", w.Name)
+	log(debugToolkit, "gui.andlabs.NewButton()", wLabel.Name)
 
-	t = mapToolkits[parentW]
+	t = mapToolkits[pwLabel]
 	if (t == nil) {
-		log.Println("go.andlabs.NewButton() toolkit struct == nil. name=", parentW.Name, w.Name)
+		log(debugToolkit, "go.andlabs.NewButton() toolkit struct == nil. name=", pwLabel.Name, wLabel.Name)
 		return
 	}
 
 	if t.broken() {
 		return
 	}
-	newt = new(andlabsT)
+	newt = tmpNewt
 
-	newt.uiLabel = ui.NewLabel(w.Name)
+	newt.uiLabel = ui.NewLabel(wLabel.Name)
 	newt.uiBox = t.uiBox
 
-	if (DebugToolkit) {
-		log.Println("gui.Toolbox.NewButton() about to append to Box parent t:", w.Name)
-		t.Dump()
-		log.Println("gui.Toolbox.NewButton() about to append to Box new t:", w.Name)
-		newt.Dump()
-	}
+	log(debugToolkit, "gui.Toolbox.NewButton() about to append to Box parent t:", wLabel.Name)
+	t.Dump()
+	log(debugToolkit, "gui.Toolbox.NewButton() about to append to Box new t:", wLabel.Name)
+	newt.Dump()
+
 	if (t.uiBox != nil) {
 		t.uiBox.Append(newt.uiLabel, false)
 	} else {
-		log.Println("ERROR: wit/gui andlabs couldn't place this label in a box")
+		log(debugToolkit, "ERROR: wit/gui andlabs couldn't place this label in a box")
 		return
 	}
-
-	mapWidgetsToolkits(w, newt)
 }