From f6fe1a503f7efb9b92004f2473e49531a686cc80 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 3 Nov 2021 23:55:58 -0500 Subject: [PATCH] TODO: delete windows (kindof) Signed-off-by: Jeff Carr --- main.go | 8 ++++++++ window-resets.go | 7 ------- window-xterm.go | 9 ++++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/main.go b/main.go index 3544e64..086c166 100644 --- a/main.go +++ b/main.go @@ -74,3 +74,11 @@ func delayedTabs() { log.Println("delayedTabs() could have added a tab here\n") // jcarrWindow.AddTab("delayed tab", nil) } + +func normalWindowClose(n *gui.Node) { + origlog.Println("TODO: close this window correctly and empty the node") + n.Dump() + name := n.Name + // TODO: this is probably some sort of terrible and wrong memory leak + delete(gui.Data.NodeMap, name) +} diff --git a/window-resets.go b/window-resets.go index 7aff344..4e91ce3 100644 --- a/window-resets.go +++ b/window-resets.go @@ -37,13 +37,6 @@ func tabResets(w *gui.Node) *gui.Node { updateDNS(nil) }) - g1.AddButton("fontNode.GetText()", func (*gui.Node) { - if (fontNode != nil) { - fontsize = fontNode.GetText() - log.Println("set fontsize =", fontsize) - } - }) - aptGroup(newTab) newTab.MakeBasicControlsPage("testing stuff") diff --git a/window-xterm.go b/window-xterm.go index c520b29..955fae1 100644 --- a/window-xterm.go +++ b/window-xterm.go @@ -13,7 +13,7 @@ func xtermSettings(w *gui.Node) { gui.Config.Title = "Configure xterm" gui.Config.Width = 105 gui.Config.Height = 105 - gui.Config.Exit = nil + gui.Config.Exit = normalWindowClose w = gui.NewWindow() } @@ -50,4 +50,11 @@ func xtermSettings(w *gui.Node) { cmd := "xterm" xterm(cmd) }) + + gNode.AddButton("fontNode.GetText()", func (*gui.Node) { + if (fontNode != nil) { + fontsize = fontNode.GetText() + log.Println("set fontsize =", fontsize) + } + }) }