diff options
Diffstat (limited to 'gocui/view.go')
| -rw-r--r-- | gocui/view.go | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/gocui/view.go b/gocui/view.go index a93ac28..aff8381 100644 --- a/gocui/view.go +++ b/gocui/view.go @@ -8,6 +8,8 @@ import ( "strings" "github.com/awesome-gocui/gocui" + + "go.wit.com/log" "go.wit.com/gui/widget" ) @@ -26,7 +28,7 @@ func (n *node) textResize() bool { var changed bool = false for i, s := range splitLines(n.Text) { - log(logInfo, "textResize() len =", len(s), i, s) + log.Log(INFO, "textResize() len =", len(s), i, s) if (width < len(s)) { width = len(s) } @@ -41,7 +43,7 @@ func (n *node) textResize() bool { changed = true } if (changed) { - n.showWidgetPlacement(logNow, "textResize() changed") + n.showWidgetPlacement(true, "textResize() changed") } return changed } @@ -57,7 +59,7 @@ func (n *node) showView() { w := n.tk if (w.cuiName == "") { - log(logError, "showView() w.cuiName was not set for widget", w) + log.Log(ERROR, "showView() w.cuiName was not set for widget", w) w.cuiName = strconv.Itoa(n.WidgetId) } @@ -66,15 +68,15 @@ func (n *node) showView() { n.recreateView() } x0, y0, x1, y1, err := me.baseGui.ViewPosition(w.cuiName) - log(logInfo, "showView() w.v already defined for widget", n.Name, err) + log.Log(INFO, "showView() w.v already defined for widget", n.Name, err) // n.smartGocuiSize() changed := n.textResize() if (changed) { - log(logNow, "showView() textResize() changed. Should recreateView here wId =", w.cuiName) + log.Log(NOW, "showView() textResize() changed. Should recreateView here wId =", w.cuiName) } else { - log(logNow, "showView() Clear() and Fprint() here wId =", w.cuiName) + log.Log(NOW, "showView() Clear() and Fprint() here wId =", w.cuiName) w.v.Clear() fmt.Fprint(w.v, n.Text) n.SetVisible(false) @@ -89,17 +91,17 @@ func (n *node) showView() { return } if (y0 != w.gocuiSize.h0) { - log(logError, "showView() start hight mismatch id=", w.cuiName, "gocui h vs computed h =", w.gocuiSize.h0, y0) + log.Log(ERROR, "showView() start hight mismatch id=", w.cuiName, "gocui h vs computed h =", w.gocuiSize.h0, y0) n.recreateView() return } if (x1 != w.gocuiSize.w1) { - log(logError, "showView() too wide", w.cuiName, "w,w", w.gocuiSize.w1, x1) + log.Log(ERROR, "showView() too wide", w.cuiName, "w,w", w.gocuiSize.w1, x1) n.recreateView() return } if (y1 != w.gocuiSize.h1) { - log(logError, "showView() too high", w.cuiName, "h,h", w.gocuiSize.h1, y1) + log.Log(ERROR, "showView() too high", w.cuiName, "h,h", w.gocuiSize.h1, y1) n.recreateView() return } @@ -112,9 +114,9 @@ func (n *node) showView() { func (n *node) recreateView() { var err error w := n.tk - log(logError, "recreateView() START", n.WidgetType, n.Name) + log.Log(ERROR, "recreateView() START", n.WidgetType, n.Name) if (me.baseGui == nil) { - log(logError, "recreateView() ERROR: me.baseGui == nil", w) + log.Log(ERROR, "recreateView() ERROR: me.baseGui == nil", w) return } @@ -123,10 +125,10 @@ func (n *node) recreateView() { w.v = nil if (n.Name == "CLOUDFLARE_EMAIL") { - n.showWidgetPlacement(logNow, "n.Name=" + n.Name + " n.Text=" + n.Text + " " + w.cuiName) + n.showWidgetPlacement(true, "n.Name=" + n.Name + " n.Text=" + n.Text + " " + w.cuiName) n.dumpWidget("jwc") n.textResize() - n.showWidgetPlacement(logNow, "n.Name=" + n.Name + " n.Text=" + n.Text + " " + w.cuiName) + n.showWidgetPlacement(true, "n.Name=" + n.Name + " n.Text=" + n.Text + " " + w.cuiName) } a := w.gocuiSize.w0 @@ -136,13 +138,13 @@ func (n *node) recreateView() { w.v, err = me.baseGui.SetView(w.cuiName, a, b, c, d, 0) if err == nil { - n.showWidgetPlacement(logError, "recreateView()") - log(logError, "recreateView() internal plugin error err = nil") + n.showWidgetPlacement(true, "recreateView()") + log.Log(ERROR, "recreateView() internal plugin error err = nil") return } if !errors.Is(err, gocui.ErrUnknownView) { - n.showWidgetPlacement(logError, "recreateView()") - log(logError, "recreateView() internal plugin error error.IS()", err) + n.showWidgetPlacement(true, "recreateView()") + log.Log(ERROR, "recreateView() internal plugin error error.IS()", err) return } @@ -161,7 +163,7 @@ func (n *node) recreateView() { w.v.Frame = w.frame w.v.Clear() fmt.Fprint(w.v, n.Text) - // n.showWidgetPlacement(logNow, "n.Name=" + n.Name + " n.Text=" + n.Text + " " + w.cuiName) + // n.showWidgetPlacement(true, "n.Name=" + n.Name + " n.Text=" + n.Text + " " + w.cuiName) // n.dumpWidget("jwc 2") // if you don't do this here, it will be black & white only @@ -173,10 +175,10 @@ func (n *node) recreateView() { w.v.SelBgColor = w.color.selBg } if (n.Name == "CLOUDFLARE_EMAIL") { - n.showWidgetPlacement(logNow, "n.Name=" + n.Name + " n.Text=" + n.Text + " " + w.cuiName) + n.showWidgetPlacement(true, "n.Name=" + n.Name + " n.Text=" + n.Text + " " + w.cuiName) n.dumpTree(true) } - log(logError, "recreateView() END") + log.Log(ERROR, "recreateView() END") } func (n *node) hideWidgets() { @@ -210,7 +212,7 @@ func (n *node) showFake() { w := n.tk if (w.isFake) { n.setFake() - n.showWidgetPlacement(logNow, "showFake:") + n.showWidgetPlacement(true, "showFake:") n.showView() } for _, child := range n.children { @@ -223,7 +225,7 @@ func (n *node) showWidgets() { if (w.isFake) { // don't display by default } else { - n.showWidgetPlacement(logInfo, "current:") + n.showWidgetPlacement(true, "current:") n.showView() } for _, child := range n.children { |