From c815c8b403e654557ad2fe95776934403ad2165c Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 30 Jan 2025 07:30:04 -0600 Subject: lots more gui cleanup --- doGui.go | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'doGui.go') diff --git a/doGui.go b/doGui.go index ea8b614..a5c9cb6 100644 --- a/doGui.go +++ b/doGui.go @@ -33,10 +33,10 @@ func doGui() { me.myGui.SetAppDefaultPlugin(me.forge.Config.DefaultGui) // sets the default GUI plugin to use me.myGui.Default() - me.mainWindow = gadgets.RawBasicWindow("Forge: (this kinda works sometimes)") - me.mainWindow.Make() - me.mainWindow.Show() - me.mainWindow.Custom = func() { + mainWindow := gadgets.RawBasicWindow("Forge: (this kinda works sometimes)") + mainWindow.Make() + mainWindow.Show() + mainWindow.Custom = func() { log.Warn("MAIN WINDOW CLOSE") count := me.forge.RillReload() log.Info("Repo Reload count =", count) @@ -46,21 +46,18 @@ func doGui() { os.Exit(0) } - me.mainbox = me.mainWindow.Box() + drawWindow(mainWindow) - // disable the interface while everything is scanned - me.Disable() - - vbox2 := me.mainbox.NewVerticalBox("BOX2") - globalBuildOptions(vbox2) - - me.Enable() // sits here forever debug() } -func globalBuildOptions(vbox *gui.Node) { +func drawWindow(win *gadgets.BasicWindow) { + box := win.Box() + + vbox := box.NewVerticalBox("BOX2") + group1 := vbox.NewGroup("Forge Settings") grid := group1.NewGrid("buildOptions", 0, 0) -- cgit v1.2.3