summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debug.go12
-rw-r--r--place.go4
-rw-r--r--showStdout.go2
-rw-r--r--view.proto1
4 files changed, 11 insertions, 8 deletions
diff --git a/debug.go b/debug.go
index 63c196b..7fa8561 100644
--- a/debug.go
+++ b/debug.go
@@ -30,20 +30,22 @@ func (w *guiWidget) showWidgetPlacement(s string) {
pId = w.node.Parent.WidgetId
}
s1 = fmt.Sprintf("(wId,pId)=(%2d,%2d) ", w.node.WidgetId, pId)
+ sizeW, sizeH := w.Size()
+ s1 += fmt.Sprintf("size=(%2d,%2d)", sizeW, sizeH)
if w.Visible() {
- sizeW, sizeH := w.Size()
- s1 += fmt.Sprintf("size=(%2d,%2d)", sizeW, sizeH)
s1 += fmt.Sprintf("gocui=(%2d,%2d,%2d,%2d)",
w.gocuiSize.w0, w.gocuiSize.h0, w.gocuiSize.w1, w.gocuiSize.h1)
} else {
- sizeW, sizeH := w.Size()
- s1 += fmt.Sprintf("size=(%2d,%2d)", sizeW, sizeH)
- s1 += fmt.Sprintf(" ")
+ s1 += fmt.Sprintf(" %2s %2s %2s %2s ", "", "", "", "")
}
if w.node.Parent != nil {
if w.node.Parent.WidgetType == widget.Grid {
s1 += fmt.Sprintf("At(%2d,%2d) ", w.node.State.AtW, w.node.State.AtH)
+ } else {
+ s1 += fmt.Sprintf(" %2s %2s ", "", "")
}
+ } else {
+ s1 += fmt.Sprintf(" %2s %2s ", "", "")
}
tmp := "." + w.String() + ". " + w.cuiName
if w.node.WidgetType == widget.Box {
diff --git a/place.go b/place.go
index 03fa579..278315f 100644
--- a/place.go
+++ b/place.go
@@ -166,8 +166,8 @@ func (w *guiWidget) realGocuiSize() *rectType {
var f func(tk *guiWidget, r *rectType)
newR := new(rectType)
// initialize the values to opposite
- newR.w0 = 80
- newR.h0 = 24
+ newR.w0 = outputW
+ newR.h0 = outputH
if me.baseGui != nil {
maxW, maxH := me.baseGui.Size()
newR.w0 = maxW
diff --git a/showStdout.go b/showStdout.go
index 7201d27..4950e68 100644
--- a/showStdout.go
+++ b/showStdout.go
@@ -11,7 +11,7 @@ import (
)
var outputW int = 180
-var outputH int = 24
+var outputH int = 40
func moveMsg(g *gocui.Gui) {
mx, my := g.MousePosition()
diff --git a/view.proto b/view.proto
index eeea1c4..537ffa2 100644
--- a/view.proto
+++ b/view.proto
@@ -22,6 +22,7 @@ message ViewSettings { // `autogenpb:nomutex`
message Tree {
View parent = 1;
repeated View children = 2;
+ View node = 3;
}
// this is the gocui 'view' in binary tree form