still loads and displays window widget

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

1 files changed, 9 insertions, 10 deletions

diff --git a/click.go b/click.go
index 3195085..7121b0b 100644
--- a/click.go
+++ b/click.go
@@ -205,9 +205,7 @@ func doWidgetClick(n *tree.Node) {
 		log.Log(NOW, "do the dropdown here")
 		if me.ddview == nil {
 			me.ddview = addDropdown()
-			// n.TK = initWidget(n)
-			var tk *guiWidget
-			tk = me.ddview.TK.(*guiWidget)
+			tk := me.ddview.TK.(*guiWidget)
 			tk.gocuiSize.w0 = 20
 			tk.gocuiSize.w1 = 40
 			tk.gocuiSize.h0 = 10
@@ -224,14 +222,14 @@ func doWidgetClick(n *tree.Node) {
 			tk.v.Frame = true
 			tk.v.Clear()
 			fmt.Fprint(tk.v, "example.com\nwit.com")
-			SetVisible(me.ddview, true)
+			tk.SetVisible(true)
 			return
 		}
-		log.Log(NOW, "doWidgetClick() visible =", Visible(me.ddview))
 		var tk *guiWidget
 		tk = me.ddview.TK.(*guiWidget)
-		if Visible(me.ddview) {
-			SetVisible(me.ddview, false)
+		log.Log(NOW, "doWidgetClick() visible =", tk.Visible())
+		if tk.Visible() {
+			tk.SetVisible(false)
 			me.baseGui.DeleteView("ddview")
 			tk.v = nil
 		} else {
@@ -244,7 +242,7 @@ func doWidgetClick(n *tree.Node) {
 			log.Log(NOW, "new dns list should be set to:", dnsList)
 			tk.labelN = dnsList
 			tk.SetText(dnsList)
-			SetVisible(me.ddview, true)
+			tk.SetVisible(true)
 		}
 		for i, s := range tk.vals {
 			log.Log(NOW, "AddText()", tk.String(), i, s)
@@ -328,7 +326,7 @@ func findUnderMouse() *tree.Node {
 		var widget *guiWidget
 		widget = n.TK.(*guiWidget)
 		// ignore widgets that are not visible
-		if Visible(n) {
+		if widget.Visible() {
 			if (widget.gocuiSize.w0 <= w) && (w <= widget.gocuiSize.w1) &&
 				(widget.gocuiSize.h0 <= h) && (h <= widget.gocuiSize.h1) {
 				widgets = append(widgets, n)
@@ -336,8 +334,9 @@ func findUnderMouse() *tree.Node {
 			}
 		}
 		if n == me.ddview {
+			tk := me.ddview.TK.(*guiWidget)
 			log.Log(NOW, "findUnderMouse() found ddview")
-			if Visible(n) {
+			if tk.Visible() {
 				log.Log(NOW, "findUnderMouse() and ddview is visable. hide it here. TODO: find highlighted row")
 				found = n
 				// find the actual value here and set the dropdown widget