GROUP: implement 'group' in toolkit/

    move gui.group into toolkit
    remove duplicate code
    update demo

3 files changed, 66 insertions, 0 deletions

diff --git a/toolkit/andlabs/demo.go b/toolkit/andlabs/demo.go
index d8452ed..05451ea 100644
--- a/toolkit/andlabs/demo.go
+++ b/toolkit/andlabs/demo.go
@@ -20,6 +20,7 @@ func DemoNumbersPage(w *ui.Window) *Toolkit {
 	t.uiBox = makeNumbersPage()
 	t.uiBox.SetPadded(true)
 	w.SetChild(t.uiBox)
+	w.SetTitle("Internal demo of andlabs/ui toolkit")
 
 	if (DebugToolkit) {
 		log.Println("gui.Toolbox.DemoNumbersPage()")
diff --git a/toolkit/andlabs/group.go b/toolkit/andlabs/group.go
new file mode 100644
index 0000000..1c3f63e
--- /dev/null
+++ b/toolkit/andlabs/group.go
@@ -0,0 +1,59 @@
+package toolkit
+
+import "log"
+
+import "github.com/andlabs/ui"
+import _ "github.com/andlabs/ui/winmanifest"
+
+// make new Group here
+func NewGroup(b *ui.Box, title string) *Toolkit {
+	var t Toolkit
+
+	if (b == nil) {
+		log.Println("gui.ToolboxNode.NewSpinbox() node.UiBox == nil. I can't add a range UI element without a place to put it")
+		return &t
+	}
+
+	log.Println("gui.Toolbox.NewGroup() create", title)
+	g := ui.NewGroup(title)
+	g.SetMargined(true)
+	t.uiGroup = g
+	t.uiBox = b
+	t.uiBox.Append(g, false)
+
+	return &t
+}
+
+// create a new box
+func (t *Toolkit) GetBox() *ui.Box {
+	return t.uiBox
+}
+
+// create a new box
+func (t *Toolkit) NewBox() *Toolkit {
+	log.Println("gui.Toolbox.NewBox() START create default")
+	if (t.uiGroup != nil) {
+		log.Println("gui.Toolbox.NewBox() is a Group")
+		var newTK Toolkit
+
+		vbox := ui.NewVerticalBox()
+		vbox.SetPadded(true)
+		t.uiGroup.SetChild(vbox)
+		newTK.uiBox = vbox
+
+		return &newTK
+	}
+	log.Println("gui.Toolbox.NewBox() FAILED")
+	return nil
+}
+
+/*
+func (n *Node) NewGroup(title string) *Node {
+	group := ui.NewGroup(title)
+	group.SetMargined(true)
+	hbox.Append(group, true)
+
+	vbox := ui.NewVerticalBox()
+	vbox.SetPadded(true)
+	group.SetChild(vbox)
+*/
diff --git a/toolkit/andlabs/structs.go b/toolkit/andlabs/structs.go
index 50dc144..ab75139 100644
--- a/toolkit/andlabs/structs.go
+++ b/toolkit/andlabs/structs.go
@@ -23,6 +23,7 @@ type Toolkit struct {
 	uiButton  *ui.Button
 	uiControl *ui.Control
 	uiEntry   *ui.Entry
+	uiGroup   *ui.Group
 	uiLabel   *ui.Label
 	uiSlider  *ui.Slider
 	uiSpinbox *ui.Spinbox
@@ -31,6 +32,11 @@ type Toolkit struct {
 	uiWindow  *ui.Window
 }
 
+func (t *Toolkit) Dump() {
+	log.Println("gui.Toolkit.Dump() uiBox   =", t.uiBox)
+	log.Println("gui.Toolkit.Dump() uiGroup =", t.uiGroup)
+}
+
 func (t *Toolkit) GetText() string {
 	if (DebugToolkit) {
 		log.Println("gui.Toolkit.Text() Enter")