From 355e5ec968427c2b07b78fec12224f31a65df740 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 14 Nov 2022 14:30:28 -0600 Subject: setup building without plugins on windows notes from github remote keep removing os.Exit() rename from andlabs2 back to andlabs rename files for windows andlabs/ui gocui always sets STDOUT a file in /tmp/ Signed-off-by: Jeff Carr --- toolkit/andlabs/tab.go | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'toolkit/andlabs/tab.go') diff --git a/toolkit/andlabs/tab.go b/toolkit/andlabs/tab.go index c641fc0..0556fb9 100644 --- a/toolkit/andlabs/tab.go +++ b/toolkit/andlabs/tab.go @@ -1,12 +1,13 @@ -package toolkit +package main import ( "log" "time" + "git.wit.org/wit/gui/toolkit" + "github.com/andlabs/ui" _ "github.com/andlabs/ui/winmanifest" - ) /* @@ -21,9 +22,9 @@ import ( once there is one. If you send a Window here, it will replace any existing tabs rather than adding a new one */ -func (t *Toolkit) AddTab(name string) *Toolkit { +func (t *andlabsT) newTab(name string) *andlabsT { // var w *ui.Window - var newt *Toolkit + var newt *andlabsT log.Println("gui.toolkit.AddTab() sleep 3") @@ -68,8 +69,8 @@ func tabSetMargined(tab *ui.Tab) { } } -func newTab(w *ui.Window, name string) *Toolkit { - var t Toolkit +func newTab(w *ui.Window, name string) *andlabsT { + var t andlabsT if (DebugToolkit) { log.Println("gui.toolkit.NewTab() ADD", name) } @@ -99,8 +100,8 @@ func newTab(w *ui.Window, name string) *Toolkit { return &t } -func (t *Toolkit) appendTab(name string) *Toolkit { - var newT Toolkit +func (t *andlabsT) appendTab(name string) *andlabsT { + var newT andlabsT if (DebugToolkit) { log.Println("gui.toolkit.NewTab() ADD", name) } @@ -131,3 +132,16 @@ func (t *Toolkit) appendTab(name string) *Toolkit { newT.uiBox = hbox return &newT } + +func NewTab(parentW *toolkit.Widget, w *toolkit.Widget) { + var newt *andlabsT + log.Println("gui.andlabs.NewTab()", w.Name) + + t := mapToolkits[parentW] + if (t == nil) { + log.Println("go.andlabs.NewTab() toolkit struct == nil. name=", parentW.Name, w.Name) + return + } + newt = t.newTab(w.Name) + mapWidgetsToolkits(w, newt) +} -- cgit v1.2.3