From 8d8aabd1c86399603347d24f9060ed311d66153c Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 27 Apr 2023 09:06:57 -0500 Subject: andlabs: window and tab now in binary tree Signed-off-by: Jeff Carr --- toolkit/andlabs/add.go | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) (limited to 'toolkit/andlabs/add.go') diff --git a/toolkit/andlabs/add.go b/toolkit/andlabs/add.go index 6d4c7cd..9c4fe54 100644 --- a/toolkit/andlabs/add.go +++ b/toolkit/andlabs/add.go @@ -21,36 +21,18 @@ func add(a toolkit.Action) { actionDump(debugError, &a) return } - if (a.WidgetId == 0) { - log(debugError, "add() error. w.WidgetId == 0") - actionDump(debugError, &a) - return - } - - // for now, window gets handled without checking where == nil) - if (a.WidgetType == toolkit.Window) { - newWindow(a) - return - } - - if (andlabs[a.ParentId] == nil) { - // listMap(debugError) // memory corruption? - log(debugError, "add() Widget.Name =", a.Name) - log(debugError, "add() Widget.Type =", a.WidgetType) - log(debugError, "ERROR add() ERROR a.Parent map to t == nil. WidgetId =", a.WidgetId, "ParentId =", a.ParentId) - exit("can not add()") + if (a.WidgetType == toolkit.Root) { + rootNode = addWidget(&a, nil) return } + n := addWidget(&a, nil) - switch a.WidgetType { + switch n.WidgetType { case toolkit.Window: - newWindow(a) + newWindow(n) return case toolkit.Tab: - log(debugError, "add() CAME AT THIS FROM add() =", a.Name) - log(debugError, "add() CAME AT THIS FROM add() =", a.Name) - log(debugError, "add() CAME AT THIS FROM add() =", a.Name) - newTab(a) + newTab(n) return case toolkit.Label: newLabel(&a) @@ -89,7 +71,7 @@ func add(a toolkit.Action) { newImage(&a) return default: - log(debugError, "add() error TODO: ", a.WidgetType, a.Name) + log(debugError, "add() error TODO: ", n.WidgetType, n.Name) } } -- cgit v1.2.3