Merge branch 'master' into jcarr

1 files changed, 22 insertions, 9 deletions

diff --git a/gui.go b/gui.go
index fca054e..ac75f1e 100644
--- a/gui.go
+++ b/gui.go
@@ -1,21 +1,34 @@
 package gui
 
-import "log"
-// import "time"
-import "regexp"
+import (
+	"github.com/andlabs/ui" // import "time"
+	"log"
+	"regexp"
 
-import "github.com/andlabs/ui"
-import _ "github.com/andlabs/ui/winmanifest"
+	_ "github.com/andlabs/ui/winmanifest"
+)
+
+// the _ means we only need this for the init()
 
 const Xaxis = 0 // box that is horizontal
 const Yaxis = 1 // box that is vertical
 
-func GuiInit() {
-	Data.buttonMap	= make(map[*ui.Button]*GuiButton)
-	Data.WindowMap	= make(map[string]*GuiWindow)
+func init() {
+	log.Println("gui.init() REMOVE THIS init()")
+
+	Data.NodeMap = make(map[string]*Node)
+	Data.NodeSlice = make([]*Node, 0)
 
+	Config.counter = 0
+	Config.prefix = "wit"
+	Config.DebugNode = false
+	Config.DebugTabs = false
+	Config.Stretchy = true
+}
+
+func GuiInit() {
 	ui.OnShouldQuit(func() bool {
-                ui.Quit()
+		ui.Quit()
 		return true
 	})
 }