From 4b6207743b90968d6b822032a4355e43b6ce6da9 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 3 Apr 2023 10:26:47 -0500 Subject: gocui: working towards correct layout make a gocui widget binary tree more debugging cleanups sample button app displays in gocui geometry logic closer to correct improvements in gocui layout continued attempts to clean up tabs dump binary tree moving towards proper chan callback() deprecate Widget.Name Signed-off-by: Jeff Carr --- toolkit/andlabs/window.go | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'toolkit/andlabs/window.go') diff --git a/toolkit/andlabs/window.go b/toolkit/andlabs/window.go index 2fee729..f00e1ee 100644 --- a/toolkit/andlabs/window.go +++ b/toolkit/andlabs/window.go @@ -16,22 +16,14 @@ func (t *andlabsT) ErrorWindow(msg1 string, msg2 string) { } func newWindow(a *toolkit.Action) { - w := a.Widget var newt *andlabsT - // log(debugToolkit, "toolkit NewWindow", w.Name, w.Width, w.Height) - - if (w == nil) { - log(debugToolkit, "wit/gui plugin error. widget == nil") - return - } newt = new(andlabsT) - newt.tw = w - newt.Type = toolkit.Window + newt.WidgetType = toolkit.Window newt.wId = a.WidgetId // menubar bool is if the OS defined border on the window should be used - win := ui.NewWindow(w.Name, a.Width, a.Height, menubar) + win := ui.NewWindow(a.Name, a.Width, a.Height, menubar) win.SetBorderless(canvas) win.SetMargined(margin) win.OnClosing(func(*ui.Window) bool { @@ -41,8 +33,7 @@ func newWindow(a *toolkit.Action) { win.Show() newt.uiWindow = win newt.uiControl = win - // newt.UiWindowBad = win // deprecate this as soon as possible - newt.Name = w.Name + newt.Name = a.Name andlabs[a.WidgetId] = newt return -- cgit v1.2.3