more node state fixesv0.20.3v0.20.2

Signed-off-by: Jeff Carr <[email protected]>

2 files changed, 8 insertions, 16 deletions

diff --git a/addText.go b/addText.go
index c6bcdbb..4759092 100644
--- a/addText.go
+++ b/addText.go
@@ -6,9 +6,6 @@ import (
 	"go.wit.com/widget"
 )
 
-func compareStrings(n *tree.Node, ss []string) {
-}
-
 func addText(n *tree.Node, s string) {
 	var tk *guiWidget
 	tk = n.TK.(*guiWidget)
@@ -21,19 +18,7 @@ func addText(n *tree.Node, s string) {
 
 	switch n.WidgetType {
 	case widget.Dropdown:
-		for i, s := range n.State.Strings {
-			log.Log(ANDLABS, "n.State.Strings =", i, s)
-			_, ok := n.Strings[s]
-			// If the key exists
-			if ok {
-				log.Log(ANDLABS, "string is already in the dropdown", i, s)
-			} else {
-				log.Log(ANDLABS, "adding new string to dropdown", i, s)
-				addDropdownName(n, s)
-				// TODO: make numbers
-				n.Strings[s] = 21
-			}
-		}
+		addDropdownName(n, s)
 	case widget.Combobox:
 		addComboboxName(n, s)
 	default:
diff --git a/main.go b/main.go
index 9751842..aa8b6b9 100644
--- a/main.go
+++ b/main.go
@@ -59,6 +59,12 @@ func queueSetChecked(n *tree.Node, b bool) {
 	})
 }
 
+func queueToolkitClose() {
+	ui.QueueMain(func() {
+		ui.Quit()
+	})
+}
+
 /*
 func queueMain(currentA widget.Action) {
 		// this never happends
@@ -130,6 +136,7 @@ func init() {
 	me.myTree.SetText = queueSetText
 	me.myTree.AddText = queueAddText
 	me.myTree.SetChecked = queueSetChecked
+	me.myTree.ToolkitClose = queueToolkitClose
 
 	// TODO: this is messed up. run ui.Main() from the first add? Initialize it with an empty thing first?
 	// fake out the OS toolkit by making a fake window. This is probably needed for macos & windows