fix window name

Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
Jeff Carr 2019-06-03 14:17:29 -07:00
parent adfc58a6c9
commit 7ec7fd15c0
1 changed files with 5 additions and 6 deletions

11
gui.go
View File

@ -18,12 +18,12 @@ func GuiInit() {
}) })
} }
func InitGuiWindow(action string, gw *GuiWindow) *GuiWindow { func InitGuiWindow(name string, gw *GuiWindow) *GuiWindow {
log.Println("InitGuiWindow() START") log.Println("InitGuiWindow() START")
var newGuiWindow GuiWindow var newGuiWindow GuiWindow
newGuiWindow.Width = Config.Width newGuiWindow.Width = Config.Width
newGuiWindow.Height = Config.Height newGuiWindow.Height = Config.Height
// newGuiWindow.Action = action newGuiWindow.Name = name
newGuiWindow.MakeWindow = gw.MakeWindow newGuiWindow.MakeWindow = gw.MakeWindow
newGuiWindow.UiWindow = gw.UiWindow newGuiWindow.UiWindow = gw.UiWindow
newGuiWindow.UiTab = gw.UiTab 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") log.Println("StartNewWindow() Create a new window")
var junk GuiWindow var junk GuiWindow
junk.MakeWindow = callback junk.MakeWindow = callback
// junk.Action = action window := InitGuiWindow(name, &junk)
window := InitGuiWindow(action, &junk)
if (bg) { if (bg) {
log.Println("StartNewWindow() START NEW GOROUTINE for ui.Main()") log.Println("StartNewWindow() START NEW GOROUTINE for ui.Main()")
go ui.Main(func() { go ui.Main(func() {
@ -65,7 +64,7 @@ func StartNewWindow(bg bool, action string, callback func(*GuiWindow) *GuiBox) {
func InitTabWindow(gw *GuiWindow) { func InitTabWindow(gw *GuiWindow) {
log.Println("InitTabWindow() START. THIS WINDOW IS NOT YET SHOWN") 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.SetBorderless(false)
gw.UiWindow.OnClosing(func(*ui.Window) bool { gw.UiWindow.OnClosing(func(*ui.Window) bool {