BOX: more removals of GuiBox

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

4 files changed, 15 insertions, 187 deletions

diff --git a/area.go b/area.go
index d25bd74..2cf3d18 100644
--- a/area.go
+++ b/area.go
@@ -117,15 +117,6 @@ func (n *Node) ShowTextBox(newText *ui.AttributedString, custom func(*GuiButton)
 	}
 	log.Println("ShowTextBox() START gw =", gw)
 
-	/*
-	var newbox *GuiBox
-	newbox		= new(GuiBox)
-	newbox.Window	= gw
-	newbox.Name	= name
-	hbox		:= ui.NewVerticalBox()
-	newbox.UiBox	= hbox
-	*/
-
 	// TODO: allow padded & axis here
 	n.uiBox.SetPadded(true)
 
diff --git a/box.go b/box.go
index 7e4d691..5953f54 100644
--- a/box.go
+++ b/box.go
@@ -9,159 +9,6 @@ import _ "github.com/andlabs/ui/winmanifest"
 
 // import "github.com/davecgh/go-spew/spew"
 
-// add(nil, newbox, "")				// use this when the Window is created. Always called 'MAINBOX'
-// add(gw.BoxMap["MAINBOX"], newbox, name)	// use this to add a box off the main box
-// add(gw.BoxMap["BUTTONBOX"], newbox, name)	// use this to add something to the box called 'BUTTONBOX'
-// add(box, newbox, name)			// add 'newbox' to 'box' and call it 'name'
-/*
-func add2(box *GuiBox, newbox *GuiBox) {
-	log.Println("gui.add() START box =", box)
-	log.Println("gui.add() START newbox =", newbox)
-	if (box == nil) {
-		log.Println("\tgui.add() add to Window as MAINBOX")
-		if (newbox.Window.UiTab != nil) {
-			// create a new tab here
-			// add the box to it as MAINBOX
-			log.Println("\tgui.add() add to Window as a UiTab")
-			// TODO: allow passing where to append
-			// newbox.Window.UiTab.InsertAt(newbox.Name, 0, newbox.UiBox)
-			newbox.Window.UiTab.Append(newbox.Name, newbox.UiBox)
-			// newbox.Window.UiTab.SetMargined(0, true)
-
-			// TODO: figure out how to make a new Tab/Window/Box here
-			// window := InitGuiWindow(Data.Config, newbox.Name, gw.MakeWindow, gw.UiWindow, gw.UiTab)
-			// window.UiTab.Delete(0)
-			// window.MakeWindow(window)
-			// newbox.Window = window
-
-			newbox.Window.BoxMap["MAINBOX"] = newbox
-			log.Println("gui.add() END")
-			panic("gui.add() MAINBOX gui.add() END")
-			return
-		} else {
-			log.Println("\tgui.add() ERROR DONT KNOW HOW TO ADD TO A RAW WINDOW YET")
-			// add this to the window
-		}
-		log.Println("\tgui.add() ERROR DON'T KNOW HOW TO add to Window as MAINBOX DONE")
-		log.Println("gui.add() END")
-		panic("gui.add() gui.add() END")
-		return
-	}
-	log.Println("\tgui.add() adding", newbox.Name, "to", box.Name)
-	// copy the box settings over
-	newbox.Window = box.Window
-	if (box.node == nil) {
-		box.Dump()
-		panic("gui.add() ERROR box.node == nil")
-	}
-
-	if (newbox.UiBox == nil) {
-		panic("gui.add() ERROR newbox.UiBox == nil")
-	}
-
-	if (box.UiBox == nil) {
-		box.Dump()
-		// panic("gui.add() ERROR box.UiBox == nil")
-		return
-		// TODO: fix this whole add() function // Oct 9
-	}
-	box.UiBox.Append(newbox.UiBox, false)
-	box.Dump()
-	panic("gui.add()")
-
-	// add the newbox to the Window.BoxMap[]
-	box.Window.BoxMap[newbox.Name] = newbox
-	log.Println("gui.add() END")
-}
-*/
-
-func (n *Node) AddBox(axis int, name string) *Node {
-	newBox		:= new(GuiBox)
-	newBox.Window	= n.window
-	newBox.Name	= name
-
-	if (n.box == nil) {
-		n.box = newBox
-	}
-
-	// make a new box & a new node
-	newNode := n.makeNode(name, 111, 100 + Config.counter)
-	newNode.box = newBox
-	Config.counter += 1
-
-	var uiBox *ui.Box
-	if (axis == Xaxis) {
-		uiBox = ui.NewHorizontalBox()
-	} else {
-		uiBox = ui.NewVerticalBox()
-	}
-	uiBox.SetPadded(true)
-	newBox.UiBox = uiBox
-	newNode.uiBox = uiBox
-
-	n.Append(newNode)
-	// add(n.box, newBox)
-	return newNode
-}
-
-func HardBox(gw *GuiWindow, axis int, name string) *GuiBox {
-	log.Println("HardBox() START axis =", axis)
-
-	if (gw.node == nil) {
-		gw.Dump()
-		panic("gui.HardBox() gw.node == nil")
-	}
-	// add a Vertical Seperator if there is already a box
-	// Is this right?
-	box := gw.BoxMap["MAINBOX"]
-	if (box != nil) {
-		if (axis == Xaxis) {
-			VerticalBreak(box)
-		} else {
-			HorizontalBreak(box)
-		}
-	}
-
-	// make the new vbox
-	var uiBox *ui.Box
-	if (axis == Xaxis) {
-		uiBox = ui.NewHorizontalBox()
-	} else {
-		uiBox = ui.NewVerticalBox()
-	}
-	uiBox.SetPadded(true)
-
-	// Init a new GuiBox
-	newbox		:= new(GuiBox)
-	newbox.Window	= gw
-	newbox.UiBox	= uiBox
-	newbox.Name	= name
-
-	// TODO: removed Oct 31
-	// add(gw.BoxMap["MAINBOX"], newbox)
-
-	log.Println("HardBox END")
-	return newbox
-}
-
-func HorizontalBreak(box *GuiBox) {
-	log.Println("VerticalSeparator added to box =", box.Name)
-	tmp := ui.NewHorizontalSeparator()
-	if (box == nil) {
-		return
-	}
-	if (box.UiBox == nil) {
-		return
-	}
-	box.UiBox.Append(tmp, false)
-}
-
-func VerticalBreak(box *GuiBox) {
-	log.Println("VerticalSeparator  added to box =", box.Name)
-	tmp := ui.NewVerticalSeparator()
-	box.UiBox.Append(tmp, false)
-}
-
 func (n *Node) AddComboBox(title string, s ...string) *Node {
 	newNode := n.AddNode(title)
 	box := n.uiBox
@@ -197,12 +44,6 @@ func (n *Node) AddComboBox(title string, s ...string) *Node {
 	return newNode
 }
 
-/*
-func (n *Node) OnChanged(f func()) {
-	f()
-}
-*/
-
 func (n *Node) GetText() string {
 	if (n.uiText == nil) {
 		return ""
diff --git a/new-structs.go b/new-structs.go
index 8097fbc..d821a3f 100644
--- a/new-structs.go
+++ b/new-structs.go
@@ -98,12 +98,6 @@ func (n *Node) Dump() {
 	}
 }
 
-/*
-func (n *Node) SetBox(box *GuiBox) {
-	n.box = box
-}
-*/
-
 func (n *Node) SetName(name string) {
 	// n.uiType.SetName(name)
 	if (n.uiWindow != nil) {
@@ -207,13 +201,13 @@ func (n *Node) ListChildren(dump bool) {
 //
 // This function should make a new node with the parent and
 // the 'stuff' Node as a child
-func (n *Node) AddTabNode(title string, b *GuiBox) *Node {
+func (n *Node) AddTabNode(title string) *Node {
 	var newNode *Node
 	parent := n
 
 	newNode = parent.makeNode(title, 444, 400 + Config.counter)
 	newNode.uiTab = parent.uiTab
-	newNode.box = b
+	// newNode.box = b
 
 	if (Config.DebugNode) {
 		fmt.Println("")
@@ -225,12 +219,12 @@ func (n *Node) AddTabNode(title string, b *GuiBox) *Node {
 		newNode.Dump()
 	}
 
-	if (newNode.uiTab == nil) {
+	if (newNode.uiTab != nil) {
 		log.Println("wit/gui/ AddTabNode() Something went wrong tab == nil")
 		// TODO: try to find the tab or window and make them if need be
-		return newNode
+		// newNode.uiTab.Append(title, b.UiBox)
+		panic("newNode.uiTab")
 	}
-	newNode.uiTab.Append(title, b.UiBox)
 
 	return newNode
 }
@@ -245,7 +239,7 @@ func (n *Node) AddTab(title string, uiC *ui.Box) *Node {
 	}
 	if parent.box == nil {
 		parent.Dump()
-		panic("gui.AddTab() ERROR box == nil")
+		// panic("gui.AddTab() ERROR box == nil")
 	}
 	if parent.uiTab == nil {
 		inittab := ui.NewTab() // no, not that 'inittab'
diff --git a/window.go b/window.go
index 403638e..8b5f9a5 100644
--- a/window.go
+++ b/window.go
@@ -159,16 +159,18 @@ func mapWindow(parent *Node, window *ui.Window, title string, x int, y int) *Nod
 
 	Data.WindowMap[newGuiWindow.Name] = &newGuiWindow
 
+	/*
 	var box GuiBox
 	box.Window = &newGuiWindow
 	box.Name = title
+	*/
 
 	node := makeNode(parent, title, x, y)
-	node.box = &box
 	node.uiWindow = window
-	box.node = node
+	// node.box = &box
+	// box.node = node
 
-	newGuiWindow.BoxMap["jcarrInitTest"] = &box
+	// newGuiWindow.BoxMap["jcarrInitTest"] = &box
 
 	return node
 }
@@ -186,10 +188,10 @@ func NewWindow() *Node {
 
 	var n *Node
 	n = mapWindow(nil, nil, title, w, h)
-	box := n.box
-	log.Println("gui.NewWindow() title = box.Name =", box.Name)
+//	box := n.box
+//	log.Println("gui.NewWindow() title = box.Name =", box.Name)
 
-	n.uiNewWindow(box.Name, w, h)
+	n.uiNewWindow(title, w, h)
 	window := n.uiWindow
 
 	f := Config.Exit
@@ -201,7 +203,7 @@ func NewWindow() *Node {
 		return true
 	})
 
-	box.Window.UiWindow = window
+	n.uiWindow = window
 	if(n.uiWindow == nil) {
 		panic("node.uiWindow == nil. This should never happen")
 	}