From 56cebf6db647436734950f157ab286d69bc32486 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Mon, 5 Feb 2024 04:28:42 -0600 Subject: [PATCH] inverse logic for sizes of boxes (orientation was wrong) Signed-off-by: Jeff Carr --- debug.go | 11 ++++++++--- size.go | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/debug.go b/debug.go index 48049fe..63c196b 100644 --- a/debug.go +++ b/debug.go @@ -36,13 +36,18 @@ func (w *guiWidget) showWidgetPlacement(s string) { s1 += fmt.Sprintf("gocui=(%2d,%2d,%2d,%2d)", w.gocuiSize.w0, w.gocuiSize.h0, w.gocuiSize.w1, w.gocuiSize.h1) } else { - s1 += fmt.Sprintf(" ") + sizeW, sizeH := w.Size() + s1 += fmt.Sprintf("size=(%2d,%2d)", sizeW, sizeH) + s1 += fmt.Sprintf(" ") } 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) } } - tmp := "." + w.String() + "." - log.Log(NOW, s1, s, w.node.WidgetType, ",", tmp, "jcarr") // , "text=", w.text) + tmp := "." + w.String() + ". " + w.cuiName + if w.node.WidgetType == widget.Box { + tmp = "." + w.node.State.Direction.String() + ". " + w.cuiName + } + log.Log(NOW, s1, s, w.node.WidgetType, ",", tmp) // } diff --git a/size.go b/size.go index b8971e9..a7581e2 100644 --- a/size.go +++ b/size.go @@ -116,7 +116,7 @@ func (w *guiWidget) sizeBox() (int, int) { continue } sizeW, sizeH := child.Size() - if child.node.State.Direction == widget.Horizontal { + if child.node.State.Direction == widget.Vertical { maxW += sizeW if sizeH > maxH { maxH = sizeH