1 files changed, 34 insertions, 42 deletions
diff --git a/toolkit/andlabs/box.go b/toolkit/andlabs/box.go
index 265d7c8..cc7451d 100644
--- a/toolkit/andlabs/box.go
+++ b/toolkit/andlabs/box.go
@@ -1,54 +1,46 @@
 package main
 
-import "github.com/andlabs/ui"
-import _ "github.com/andlabs/ui/winmanifest"
+import (
+	"git.wit.org/wit/gui/toolkit"
 
-// create a new box
-func (t *andlabsT) getBox() *ui.Box {
-	return t.uiBox
-}
-
-// create a new box
-func (t *andlabsT) newBox() *andlabsT {
-	log(debugToolkit, "newBox() START create default")
-	t.Dump(debugToolkit)
-	if (t.uiGroup != nil) {
-		log(debugToolkit, "\tnewBox() is a Group")
-		var newTK andlabsT
+	"github.com/andlabs/ui"
+	_ "github.com/andlabs/ui/winmanifest"
+)
 
-		vbox := ui.NewVerticalBox()
-		vbox.SetPadded(padded)
-		t.uiGroup.SetChild(vbox)
-		newTK.uiBox = vbox
+// make new Box here
+func newBox(a *toolkit.Action) {
+	w := a.Widget
+	parentW := a.Where
+	log(debugToolkit, "newBox()", w.Name)
 
-		return &newTK
+	t := mapToolkits[parentW]
+	if (t == nil) {
+		log(debugToolkit, "newBox() toolkit struct == nil. name=", parentW.Name, w.Name)
+		listMap(debugToolkit)
 	}
-	if (t.uiBox != nil) {
-		log(debugToolkit, "\tnewBox() is a Box")
-		var newTK andlabsT
+	newt := t.rawBox(w.Name, a.B)
+	newt.boxC = 0
+	place(a, t, newt)
+	mapWidgetsToolkits(a, newt)
+}
 
-		vbox := ui.NewVerticalBox()
-		vbox.SetPadded(padded)
-		t.uiBox.Append(vbox, stretchy)
-		newTK.uiBox = vbox
-		newTK.Name = t.Name
+// make new Box using andlabs/ui
+func (t *andlabsT) rawBox(title string, b bool) *andlabsT {
+	var newt andlabsT
+	var box *ui.Box
+	newt.Name = title
 
-		return &newTK
+	log(debugToolkit, "rawBox() create", newt.Name)
+
+	if (b) {
+		box = ui.NewHorizontalBox()
+	} else {
+		box = ui.NewVerticalBox()
 	}
-	if (t.uiWindow != nil) {
-		log(debugToolkit, "\tnewBox() is a Window")
-		var newT andlabsT
+	box.SetPadded(padded)
 
-		vbox := ui.NewVerticalBox()
-		vbox.SetPadded(padded)
-		t.uiWindow.SetChild(vbox)
-		newT.uiBox = vbox
-		newT.Name = t.Name
+	newt.uiBox = box
+	newt.uiControl = box
 
-		// panic("WTF")
-		return &newT
-	}
-	log(debugToolkit, "\tnewBox() FAILED. Couldn't figure out where to make a box")
-	t.Dump(debugToolkit)
-	return nil
+	return &newt
 }