From 6822cc60f435cc065114ed6aef5a8a190b1144aa Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 1 Jun 2019 14:16:00 -0700 Subject: compiles again Signed-off-by: Jeff Carr --- misc.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'misc.go') diff --git a/misc.go b/misc.go index ed6a180..a685b81 100644 --- a/misc.go +++ b/misc.go @@ -14,18 +14,20 @@ import pb "git.wit.com/wit/witProtobuf" // THIS IS NOT CLEAN (almost?) -func ShowTab(gw *GuiWindow, tabname string, title string) { +func ShowTab(gw *GuiWindow, tabname string, title string) *GuiWindow { log.Println("ShowTab() gw =", gw) if (gw.UiTab == nil) { log.Println("ShowTab() gw.UiTab = nil THIS IS BAD") os.Exit(-1) } - gw.UiTab.Delete(0) - - abox := gw.MakeWindow(gw) - gw.BoxMap[tabname] = abox - gw.UiTab.InsertAt(title, 0, abox.UiBox) - gw.UiTab.SetMargined(0, true) + window := InitGuiWindow(Data.Config, tabname, gw.MakeWindow, gw.UiWindow, gw.UiTab) + window.UiTab.Delete(0) + + abox := window.MakeWindow(window) + window.BoxMap[tabname] = abox + window.UiTab.InsertAt(title, 0, abox.UiBox) + window.UiTab.SetMargined(0, true) + return window } func GuiInit() { -- cgit v1.2.3