From 0e3fa348aad1df22b584864292afae73d03af16a Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Jun 2019 13:03:00 -0700 Subject: log output here Signed-off-by: Jeff Carr --- gui.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gui.go') diff --git a/gui.go b/gui.go index 0bb6310..d27d8c2 100644 --- a/gui.go +++ b/gui.go @@ -120,9 +120,13 @@ func normalizeInt(s string) string { } func MessageWindow(gw *GuiWindow, msg1 string, msg2 string) { + log.Println("gui.MessageWindow() msg1 =", msg1) + log.Println("gui.MessageWindow() msg2 =", msg2) ui.MsgBox(gw.UiWindow, msg1, msg2) } func ErrorWindow(gw *GuiWindow, msg1 string, msg2 string) { + log.Println("gui.ErrorWindow() msg1 =", msg1) + log.Println("gui.ErrorWindow() msg2 =", msg2) ui.MsgBoxError(gw.UiWindow, msg1, msg2) } -- cgit v1.2.3 From 6b5c78fbe96b2b23e38267ee0d495440baf113c1 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Jun 2019 14:17:29 -0700 Subject: fix window name Signed-off-by: Jeff Carr --- gui.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gui.go') diff --git a/gui.go b/gui.go index d27d8c2..e54517c 100644 --- a/gui.go +++ b/gui.go @@ -18,12 +18,12 @@ func GuiInit() { }) } -func InitGuiWindow(action string, gw *GuiWindow) *GuiWindow { +func InitGuiWindow(name string, gw *GuiWindow) *GuiWindow { log.Println("InitGuiWindow() START") var newGuiWindow GuiWindow newGuiWindow.Width = Config.Width newGuiWindow.Height = Config.Height -// newGuiWindow.Action = action + newGuiWindow.Name = name newGuiWindow.MakeWindow = gw.MakeWindow newGuiWindow.UiWindow = gw.UiWindow newGuiWindow.UiTab = gw.UiTab @@ -40,12 +40,11 @@ func InitGuiWindow(action string, gw *GuiWindow) *GuiWindow { } -func StartNewWindow(bg bool, action string, callback func(*GuiWindow) *GuiBox) { +func StartNewWindow(bg bool, name string, callback func(*GuiWindow) *GuiBox) { log.Println("StartNewWindow() Create a new window") var junk GuiWindow junk.MakeWindow = callback -// junk.Action = action - window := InitGuiWindow(action, &junk) + window := InitGuiWindow(name, &junk) if (bg) { log.Println("StartNewWindow() START NEW GOROUTINE for ui.Main()") go ui.Main(func() { @@ -65,7 +64,7 @@ func StartNewWindow(bg bool, action string, callback func(*GuiWindow) *GuiBox) { func InitTabWindow(gw *GuiWindow) { log.Println("InitTabWindow() START. THIS WINDOW IS NOT YET SHOWN") - gw.UiWindow = ui.NewWindow("InitTabWindow()", int(gw.Width), int(gw.Height), true) + gw.UiWindow = ui.NewWindow(gw.Name, int(gw.Width), int(gw.Height), true) gw.UiWindow.SetBorderless(false) gw.UiWindow.OnClosing(func(*ui.Window) bool { -- cgit v1.2.3 From 50c6e6c07d12841370a0830d79a7b74b974a20f8 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Jun 2019 15:45:40 -0700 Subject: make a WindowMap to track which windows exist Signed-off-by: Jeff Carr --- debug.go | 7 +++++-- gui.go | 14 ++++++++++++-- structs.go | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) (limited to 'gui.go') diff --git a/debug.go b/debug.go index 9d862bc..89ac686 100644 --- a/debug.go +++ b/debug.go @@ -31,10 +31,13 @@ func WatchGUI() { } func DumpBoxes() { + for name, window := range Data.WindowMap { + log.Println("gui.DumpBoxes() Data.WindowMap name =", name, "Window.Name =", window.Name) + } for i, window := range Data.Windows { - log.Println("watchGUI() Data.Windows", i, "Name =", window.Name) + log.Println("gui.DumpBoxes() Data.Windows", i, "Name =", window.Name) for name, abox := range window.BoxMap { - log.Printf("\twatchGUI() BOX mapname=%-12s abox.Name=%-12s", name, abox.Name) + log.Printf("gui.DumpBoxes() \tBOX mapname=%-12s abox.Name=%-12s", name, abox.Name) /* if (name == "DEBUG") { log.Println("\t\twatchGUI() BOX abox =", reflect.TypeOf(abox)) diff --git a/gui.go b/gui.go index e54517c..ef1ff49 100644 --- a/gui.go +++ b/gui.go @@ -12,6 +12,8 @@ const Yaxis = 1 // box that is vertical func GuiInit() { Data.buttonMap = make(map[*ui.Button]*GuiButton) + Data.WindowMap = make(map[string]*GuiWindow) + ui.OnShouldQuit(func() bool { ui.Quit() return true @@ -29,8 +31,16 @@ func InitGuiWindow(name string, gw *GuiWindow) *GuiWindow { newGuiWindow.UiTab = gw.UiTab newGuiWindow.BoxMap = make(map[string]*GuiBox) newGuiWindow.EntryMap = make(map[string]*GuiEntry) - newGuiWindow.EntryMap["test"] = nil - Data.Windows = append(Data.Windows, &newGuiWindow) + Data.Windows = append(Data.Windows, &newGuiWindow) + + if (Data.WindowMap == nil) { + log.Println("gui.InitGuiWindow() making the Data.WindowMap here") + Data.WindowMap = make(map[string]*GuiWindow) + } + Data.WindowMap[name] = &newGuiWindow + + // make a blank entry for testing + // newGuiWindow.EntryMap["test"] = nil if (Data.buttonMap == nil) { GuiInit() diff --git a/structs.go b/structs.go index a074e56..aae0b7f 100644 --- a/structs.go +++ b/structs.go @@ -29,6 +29,7 @@ type GuiData struct { // A map of all the entry boxes AllEntries []*GuiEntry Windows []*GuiWindow + WindowMap map[string]*GuiWindow // A map of all buttons everywhere on all // windows, all tabs, across all goroutines -- cgit v1.2.3