large refactor to use the tree package

    Things build and now need to be fixed
    treeRoot has no children
    lists all widgets works
    shows help
    module loads

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 17 insertions, 13 deletions

diff --git a/add.go b/add.go
index 76a1ea7..c732ab4 100644
--- a/add.go
+++ b/add.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	log "go.wit.com/log"
+	"go.wit.com/toolkits/tree"
 	"go.wit.com/widget"
 )
 
@@ -9,11 +10,12 @@ var fakeStartWidth int = me.FakeW
 var fakeStartHeight int = me.TabH + me.FramePadH
 
 // setup fake labels for non-visible things off screen
-func (n *node) setFake() {
-	w := n.tk
+func setFake(n *tree.Node) {
+	var w *guiWidget
+	w = n.TK.(*guiWidget)
 	w.isFake = true
 
-	n.gocuiSetWH(fakeStartWidth, fakeStartHeight)
+	w.gocuiSetWH(fakeStartWidth, fakeStartHeight)
 
 	fakeStartHeight += w.gocuiSize.Height()
 	// TODO: use the actual max hight of the terminal window
@@ -22,23 +24,25 @@ func (n *node) setFake() {
 		fakeStartWidth += me.FakeW
 	}
 	if true {
-		n.showView()
+		w.showView()
 	}
 }
 
 // set the widget start width & height
-func (n *node) addWidget() {
-	nw := n.tk
-	log.Log(INFO, "setStartWH() w.id =", n.WidgetId, "n.name", n.progname)
+// func (n *node) addWidget(n *tree.Node) {
+func addWidget(n *tree.Node) {
+	var nw *guiWidget
+	nw = n.TK.(*guiWidget)
+	log.Log(INFO, "setStartWH() w.id =", n.WidgetId, "n.name", n.String())
 	switch n.WidgetType {
 	case widget.Root:
-		log.Log(INFO, "setStartWH() rootNode w.id =", n.WidgetId, "w.name", n.progname)
+		log.Log(INFO, "setStartWH() rootNode w.id =", n.WidgetId, "w.name", n.String())
 		nw.color = &colorRoot
-		n.setFake()
+		setFake(n)
 		return
 	case widget.Flag:
 		nw.color = &colorFlag
-		n.setFake()
+		setFake(n)
 		return
 	case widget.Window:
 		nw.frame = false
@@ -54,12 +58,12 @@ func (n *node) addWidget() {
 	case widget.Box:
 		nw.color = &colorBox
 		nw.isFake = true
-		n.setFake()
+		setFake(n)
 		return
 	case widget.Grid:
 		nw.color = &colorGrid
 		nw.isFake = true
-		n.setFake()
+		setFake(n)
 		return
 	case widget.Group:
 		nw.color = &colorGroup
@@ -76,5 +80,5 @@ func (n *node) addWidget() {
 			}
 		*/
 	}
-	n.showWidgetPlacement(true, "addWidget()")
+	showWidgetPlacement(n, true, "addWidget()")
 }