simple cleanups

init.go

@@ -58,7 +58,7 @@ func init() {
 	me.myTree.SetChecked = queueSetChecked
 	me.myTree.ToolkitClose = queueToolkitClose
 
-	me.newWindowTrigger = make(chan bool, 1)
+	me.newWindowTrigger = make(chan *guiWidget, 1)
 	go newWindowTrigger()
 
 	log.Log(NOW, "Init() start pluginChan")
@@ -200,14 +200,17 @@ func newWindowTrigger() {
 	for {
 		log.Log(NOW, "newWindowTrigger() for loop")
 		select {
-		case a := <-me.newWindowTrigger:
+		case tk := <-me.newWindowTrigger:
-			log.Log(NOW, "newWindowTrigger() got new window", a)
+			log.Log(NOW, "newWindowTrigger() got new window", tk.cuiName)
 			time.Sleep(200 * time.Millisecond)
 			redoWindows(1, -1)
 			if !me.stdout.init {
 				me.stdout.init = true
 				relocateStdoutOffscreen()
 			}
+			tk.makeWindowActive()
+			tk.doWidgetClick(tk.gocuiSize.w0, tk.gocuiSize.h0)
+			setThingsOnTop() // sets help, Stdout, etc on the top after windows have been redrawn
 			log.Log(NOW, "newWindowTrigger() after sleep")
 		}
 	}

structs.go

@@ -64,7 +64,7 @@ type config struct {
 	supermouse       bool            // prints out every widget found while you move the mouse around
 	depth            int             // used for listWidgets() debugging
 	globalMouseDown  bool            // yep, mouse is pressed
-	newWindowTrigger chan bool    // work around hack to redraw windows a bit after NewWindow()
+	newWindowTrigger chan *guiWidget // work around hack to redraw windows a bit after NewWindow()
 	stdout           stdout          // information for the STDOUT window
 	showDebug        bool            // todo: move this into config struct
 	dropdown         dropdown        // the dropdown menu

treeAdd.go

@@ -31,71 +31,71 @@ func setFake(n *tree.Node) {
 // set the widget start width & height
 // func (n *node) addWidget(n *tree.Node) {
 func addWidget(n *tree.Node) {
-	var nw *guiWidget
+	var tk *guiWidget
-	nw = n.TK.(*guiWidget)
+	tk = 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.String())
-		nw.color = &colorRoot
+		tk.color = &colorRoot
 		setFake(n)
 		return
 	case widget.Flag:
-		nw.color = &colorFlag
+		tk.color = &colorFlag
 		setFake(n)
 		return
 	case widget.Window:
-		nw.frame = false
+		tk.frame = false
-		// nw.color = &colorWindow
+		// tk.color = &colorWindow
-		nw.setColor(&colorWindow)
+		tk.setColor(&colorWindow)
-		me.newWindowTrigger <- true
+		me.newWindowTrigger <- tk
 		redoWindows(0, 0)
 		hideHelp()
 		showHelp()
 		return
 	case widget.Stdout:
-		nw.labelN = "moreSTDOUT"
+		tk.labelN = "moreSTDOUT"
 		n.State.ProgName = "moreSTDOUT"
 		n.State.Label = "moreSTDOUT"
 		return
 	case widget.Tab:
-		nw.color = &colorTab
+		tk.color = &colorTab
 		return
 	case widget.Button:
-		nw.color = &colorButton
+		tk.color = &colorButton
 		return
 	case widget.Checkbox:
-		nw.color = &colorCheckbox
+		tk.color = &colorCheckbox
-		nw.labelN = "X " + n.State.Label
+		tk.labelN = "X " + n.State.Label
 		return
 	case widget.Dropdown:
-		nw.color = &colorDropdown
+		tk.color = &colorDropdown
 		return
 	case widget.Textbox:
 		n.State.Label = "TEXTBOX"
-		nw.labelN = "    " + n.State.Label
+		tk.labelN = "    " + n.State.Label
-		nw.color = &colorDropdown
+		tk.color = &colorDropdown
 		return
 	case widget.Combobox:
-		nw.color = &colorCombobox
+		tk.color = &colorCombobox
 		return
 	case widget.Box:
-		nw.color = &colorBox
+		tk.color = &colorBox
-		nw.isFake = true
+		tk.isFake = true
 		setFake(n)
 		return
 	case widget.Grid:
-		nw.color = &colorGrid
+		tk.color = &colorGrid
-		nw.isFake = true
+		tk.isFake = true
 		setFake(n)
 		return
 	case widget.Group:
-		nw.color = &colorGroup
+		tk.color = &colorGroup
-		nw.frame = false
+		tk.frame = false
 		return
 	case widget.Label:
-		nw.color = &colorLabel
+		tk.color = &colorLabel
-		nw.frame = false
+		tk.frame = false
 		return
 	default:
 		/*
@@ -104,5 +104,5 @@ func addWidget(n *tree.Node) {
 			}
 		*/
 	}
-	nw.dumpWidget("in addWidget()")
+	tk.dumpWidget("addWidget()unknown")
 }

window.go

@@ -6,6 +6,7 @@ package main
 import (
 	"fmt"
 
+	log "go.wit.com/log"
 	"go.wit.com/toolkits/tree"
 	"go.wit.com/widget"
 )
@@ -37,7 +38,13 @@ func (tk *guiWidget) redrawWindow(w int, h int) {
 	tk.full.h0 = tk.force.h0
 
 	tk.setFullSize()
-	me.baseGui.SetView(tk.cuiName, tk.gocuiSize.w0, tk.gocuiSize.h0, tk.gocuiSize.w1, tk.gocuiSize.h1, 0)
+	v, err := me.baseGui.SetView(tk.cuiName, tk.gocuiSize.w0, tk.gocuiSize.h0, tk.gocuiSize.w1, tk.gocuiSize.h1, 0)
+	if err != nil {
+		log.Info("crap. got an err", err)
+	}
+	if tk.v != v {
+		log.Info("crap. got another problem v != tk.v")
+	}
 	tk.Show()
 	tk.v.Clear()
 	fmt.Fprint(tk.v, "ZZZ"+tk.GetText())