From c5ecf7ca329282fa8b7621bc69d142f3e870cfe4 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 15 Feb 2024 08:15:38 -0600 Subject: [PATCH] avoid window in window crash. TODO: make it work Signed-off-by: Jeff Carr --- place.go | 4 ++++ window.go | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/place.go b/place.go index 54cfe0b..36ef4dd 100644 --- a/place.go +++ b/place.go @@ -106,6 +106,10 @@ func place(p *tree.Node, n *tree.Node) bool { return true case widget.Window: log.Log(INFO, "Adding Something to Window", n.WidgetId, n.GetProgName()) + if n.WidgetType == widget.Window { + log.Log(INFO, "TODO: make window in a window a tab", n.WidgetId, n.GetProgName()) + return true + } ptk.uiWindow.SetChild(tk.uiControl) return true default: diff --git a/window.go b/window.go index 5884db9..60fbb76 100644 --- a/window.go +++ b/window.go @@ -3,6 +3,8 @@ package main import ( "go.wit.com/dev/andlabs/ui" _ "go.wit.com/dev/andlabs/ui/winmanifest" + "go.wit.com/log" + "go.wit.com/widget" "go.wit.com/toolkits/tree" ) @@ -33,7 +35,11 @@ func newWindow(p, n *tree.Node) { newt.uiControl = win n.TK = newt - place(p, n) + if p.WidgetType == widget.Window { + log.Log(WARN, "newWindow() TODO: make this window a tab") + } else { + place(p, n) + } win.Show() return }