new paths

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

1 files changed, 24 insertions, 24 deletions

diff --git a/gocui/click.go b/gocui/click.go
index c59fc0f..6d8b20a 100644
--- a/gocui/click.go
+++ b/gocui/click.go
@@ -3,8 +3,8 @@ package main
 import (
 	"fmt"
 	"github.com/awesome-gocui/gocui"
+	"go.wit.com/lib/widget"
 	"go.wit.com/log"
-	"go.wit.com/gui/widget"
 )
 
 // set isCurrent = false everywhere
@@ -92,15 +92,15 @@ func (n *node) doWidgetClick() {
 	case widget.Root:
 		// THIS IS THE BEGINING OF THE LAYOUT
 		log.Log(NOW, "doWidgetClick()", n.progname)
-		redoWindows(0,0)
+		redoWindows(0, 0)
 	case widget.Flag:
 		log.Log(NOW, "doWidgetClick() FLAG widget name =", n.progname)
 		log.Log(NOW, "doWidgetClick() if this is the dropdown menu, handle it here?")
 	case widget.Window:
-		if (me.currentWindow == n) {
+		if me.currentWindow == n {
 			return
 		}
-		if (me.currentWindow != nil) {
+		if me.currentWindow != nil {
 			unsetCurrent(me.currentWindow)
 			me.currentWindow.setColor(&colorWindow)
 			me.currentWindow.hideWidgets()
@@ -111,7 +111,7 @@ func (n *node) doWidgetClick() {
 		n.setColor(&colorActiveW)
 		n.redoTabs(me.TabW, me.TabH)
 		for _, child := range n.children {
-			if (child.currentTab == true) {
+			if child.currentTab == true {
 				log.Log(NOW, "FOUND CURRENT TAB", child.progname)
 				setCurrentTab(child)
 				child.placeWidgets(me.RawW, me.RawH)
@@ -124,12 +124,12 @@ func (n *node) doWidgetClick() {
 		}
 		*/
 	case widget.Tab:
-		if (n.IsCurrent()) {
+		if n.IsCurrent() {
 			return // do nothing if you reclick on the already selected tab
 		}
 		// find the window and disable the active tab
 		p := n.parent
-		if (p != nil) {
+		if p != nil {
 			p.hideWidgets()
 			p.redoTabs(me.TabW, me.TabH)
 			unsetCurrent(p)
@@ -149,7 +149,7 @@ func (n *node) doWidgetClick() {
 		// n.placeWidgets(p.tk.startH, newH)
 		n.toggleTree()
 	case widget.Checkbox:
-		if (widget.GetBool(n.value)) {
+		if widget.GetBool(n.value) {
 			n.setCheckbox(false)
 		} else {
 			n.setCheckbox(true)
@@ -166,7 +166,7 @@ func (n *node) doWidgetClick() {
 		n.showWidgets()
 	case widget.Box:
 		// w.showWidgetPlacement(logNow, "drawTree()")
-		if (n.direction == widget.Horizontal) {
+		if n.direction == widget.Horizontal {
 			log.Log(NOW, "BOX IS HORIZONTAL", n.progname)
 		} else {
 			log.Log(NOW, "BOX IS VERTICAL", n.progname)
@@ -177,7 +177,7 @@ func (n *node) doWidgetClick() {
 		n.doUserEvent()
 	case widget.Dropdown:
 		log.Log(NOW, "do the dropdown here")
-		if (me.ddview == nil) {
+		if me.ddview == nil {
 			me.ddview = addDropdown()
 			tk := me.ddview.tk
 			tk.gocuiSize.w0 = 20
@@ -189,7 +189,7 @@ func (n *node) doWidgetClick() {
 				tk.gocuiSize.h0,
 				tk.gocuiSize.w1,
 				tk.gocuiSize.h1, 0)
-			if (tk.v == nil) {
+			if tk.v == nil {
 				return
 			}
 			tk.v.Wrap = true
@@ -200,7 +200,7 @@ func (n *node) doWidgetClick() {
 			return
 		}
 		log.Log(NOW, "doWidgetClick() visible =", me.ddview.Visible())
-		if (me.ddview.Visible()) {
+		if me.ddview.Visible() {
 			me.ddview.SetVisible(false)
 			me.baseGui.DeleteView("ddview")
 			me.ddview.tk.v = nil
@@ -224,8 +224,9 @@ func (n *node) doWidgetClick() {
 }
 
 var toggle bool = true
+
 func (n *node) toggleTree() {
-	if (toggle) {
+	if toggle {
 		n.drawTree(toggle)
 		toggle = false
 	} else {
@@ -234,15 +235,14 @@ func (n *node) toggleTree() {
 	}
 }
 
-
 // display the widgets in the binary tree
 func (n *node) drawTree(draw bool) {
 	w := n.tk
-	if (w == nil) {
+	if w == nil {
 		return
 	}
 	n.showWidgetPlacement(true, "drawTree()")
-	if (draw) {
+	if draw {
 		// w.textResize()
 		n.showView()
 	} else {
@@ -261,9 +261,9 @@ func click(g *gocui.Gui, v *gocui.View) error {
 	log.Log(INFO, "click() START", v.Name())
 	// n := me.rootNode.findWidgetName(v.Name())
 	n := findUnderMouse()
-	if (n != nil) {
+	if n != nil {
 		log.Log(NOW, "click() Found widget =", n.WidgetId, n.progname, ",", n.label)
-		if (n.progname == "DropBox") {
+		if n.progname == "DropBox" {
 			log.Log(NOW, "click() this is the dropdown menu. set a flag here what did I click? where is the mouse?")
 			log.Log(NOW, "click() set a global dropdown clicked flag=true here")
 			me.ddClicked = true
@@ -285,7 +285,7 @@ func click(g *gocui.Gui, v *gocui.View) error {
 func findUnderMouse() *node {
 	var found *node
 	var widgets []*node
-	var f func (n *node)
+	var f func(n *node)
 	w, h := me.baseGui.MousePosition()
 
 	// find buttons that are below where the mouse button click
@@ -293,13 +293,13 @@ func findUnderMouse() *node {
 		widget := n.tk
 		// ignore widgets that are not visible
 		if n.Visible() {
-			if ((widget.gocuiSize.w0 <= w) && (w <= widget.gocuiSize.w1) &&
-			(widget.gocuiSize.h0 <= h) && (h <= widget.gocuiSize.h1)) {
+			if (widget.gocuiSize.w0 <= w) && (w <= widget.gocuiSize.w1) &&
+				(widget.gocuiSize.h0 <= h) && (h <= widget.gocuiSize.h1) {
 				widgets = append(widgets, n)
 				found = n
 			}
 		}
-		if (n == me.ddview) {
+		if n == me.ddview {
 			log.Log(NOW, "findUnderMouse() found ddview")
 			if n.Visible() {
 				log.Log(NOW, "findUnderMouse() and ddview is visable. hide it here. TODO: find highlighted row")
@@ -331,14 +331,14 @@ func ctrlDown(g *gocui.Gui, v *gocui.View) error {
 	// var widgets []*node
 	// var f func (n *node)
 	found = findUnderMouse()
-	if (me.ctrlDown == nil) {
+	if me.ctrlDown == nil {
 		setupCtrlDownWidget()
 		me.ctrlDown.label = found.progname
 		me.ctrlDown.tk.cuiName = "ctrlDown"
 		// me.ctrlDown.parent = me.rootNode
 	}
 	cd := me.ctrlDown.tk
-	if (found == nil) {
+	if found == nil {
 		found = me.rootNode
 	}
 	me.ctrlDown.label = found.progname