merge this into a single window

doGui.go

@@ -202,15 +202,17 @@ func drawWindow(win *gadgets.GenericWindow) {
 		patches = makePatchsetsWin()
 	})
 
-	// the user mode "hack Window"
+	/*
-	var hackWin *gadgets.GenericWindow
+		// the user mode "hack Window"
-	gridM.NewButton("Hack Window", func() {
+		var hackWin *gadgets.GenericWindow
-		if hackWin != nil {
+		gridM.NewButton("Hack Window", func() {
-			hackWin.Toggle()
+			if hackWin != nil {
-			return
+				hackWin.Toggle()
-		}
+				return
-		hackWin = makeHackModeWindow()
+			}
-	})
+			hackWin = makeHackModeWindow()
+		})
+	*/
 
 	var reposWin *gadgets.GenericWindow
 	me.reposWinB = gridM.NewButton("Repos", func() {

windowHackMode.go

@@ -11,9 +11,9 @@ import (
 	"go.wit.com/log"
 )
 
-func makeHackModeWindow() *gadgets.GenericWindow {
+func makeHackModeWindow(win *gadgets.GenericWindow) {
-	win := gadgets.NewGenericWindow("git user branch / Hack Mode Window", "This is a work in progress")
+	group := win.Stack.NewGroup("This is a work in progress")
-	grid := win.Group.RawGrid()
+	grid := group.RawGrid()
 	grid.NewButton("git pull", func() {
 		log.Info("todo: run git pull on each repo")
 	})
@@ -111,5 +111,4 @@ func makeHackModeWindow() *gadgets.GenericWindow {
 	grid.NewButton("debugger()", func() {
 		debugger.DebugWindow()
 	})
-	return win
 }

windowRepos.go

@@ -268,6 +268,7 @@ func makeReposWin() *gadgets.GenericWindow {
 	})
 	grid.NextRow()
 
+	makeHackModeWindow(win)
 	return win
 }