diff options
Diffstat (limited to 'stdoutShow.go')
| -rw-r--r-- | stdoutShow.go | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/stdoutShow.go b/stdoutShow.go index 740a6c4..43e6fd3 100644 --- a/stdoutShow.go +++ b/stdoutShow.go @@ -34,14 +34,12 @@ func showMsg(g *gocui.Gui, v *gocui.View) error { } func makeOutputWidget(g *gocui.Gui, stringFromMouseClick string) *gocui.View { - // maxX, maxY := g.Size() - if me.treeRoot == nil { // keep skipping this until the binary tree is initialized return nil } - if me.logStdout == nil { + if me.stdout.tk == nil { a := new(widget.Action) a.ProgName = "stdout" a.WidgetType = widget.Stdout @@ -49,13 +47,11 @@ func makeOutputWidget(g *gocui.Gui, stringFromMouseClick string) *gocui.View { a.ParentId = 0 // n := addNode(a) n := me.myTree.AddNode(a) - me.logStdout = initWidget(n) + me.stdout.tk = initWidget(n) - tk := me.logStdout - // tk.gocuiSize.w0 = maxX - 32 - // tk.gocuiSize.h0 = maxY / 2 - tk.gocuiSize.w0 = 30 - tk.gocuiSize.h0 = 10 + tk := me.stdout.tk + tk.gocuiSize.w0 = me.stdout.offsetW + tk.gocuiSize.h0 = me.stdout.offsetH tk.gocuiSize.w1 = tk.gocuiSize.w0 + me.stdout.w tk.gocuiSize.h1 = tk.gocuiSize.h0 + me.stdout.h @@ -68,21 +64,9 @@ func makeOutputWidget(g *gocui.Gui, stringFromMouseClick string) *gocui.View { log.Log(NOW, "makeoutputwindow() msg != nil. WTF now? err =", err) } - /* - if me.startOutputW == 0 { - me.startOutputW = maxX - 132 - } - if me.startOutputW == 0 { - me.startOutputH = maxY / 2 - } - */ + rect := me.stdout.tk.gocuiSize + v, err = g.SetView("msg", rect.w0, rect.h0, rect.w1, rect.h1, 0) - a := me.logStdout.gocuiSize.w0 - b := me.logStdout.gocuiSize.h0 - c := me.logStdout.gocuiSize.w1 - d := me.logStdout.gocuiSize.h1 - v, err = g.SetView("msg", a, b, c, d, 0) - // v, err = g.SetView("msg", me.startOutputW, me.startOutputH, maxX/2+me.stdout.w, maxY/2+me.stdout.h, 0) if errors.Is(err, gocui.ErrUnknownView) { log.Log(NOW, "makeoutputwindow() this is supposed to happen?", err) } @@ -96,7 +80,7 @@ func makeOutputWidget(g *gocui.Gui, stringFromMouseClick string) *gocui.View { log.Log(NOW, "makeoutputwindow() msg == nil. WTF now? err =", err) return nil } else { - me.logStdout.v = v + me.stdout.tk.v = v } v.Clear() @@ -105,7 +89,7 @@ func makeOutputWidget(g *gocui.Gui, stringFromMouseClick string) *gocui.View { fmt.Fprintln(v, "figure out how to capture STDOUT to here\n"+stringFromMouseClick) g.SetViewOnBottom("msg") - me.logStdout.v = v - me.logStdout.DrawAt(10, 10) + me.stdout.tk.v = v + me.stdout.tk.DrawAt(me.stdout.offsetW, me.stdout.offsetH) return v } |