From 9d5cd2c865c298fd3c8c9fb9b5de83079d1fbc7c Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Tue, 4 Feb 2025 10:14:00 -0600 Subject: [PATCH] somethings still wrong somewhere --- eventMouseClick.go | 2 +- eventMouseMove.go | 2 ++ place.go | 21 +++++++++++++-------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/eventMouseClick.go b/eventMouseClick.go index 81b8aaf..2ad7274 100644 --- a/eventMouseClick.go +++ b/eventMouseClick.go @@ -23,8 +23,8 @@ func (tk *guiWidget) redrawWindow(w int, h int) { h = h + 4 tk.DrawAt(w, h) tk.setColor(&colorActiveW) // sets the window to Green BG + tk.placeWidgets(w, h) // compute the sizes & places for each widget tk.showWidgets() - tk.placeWidgets(w, h) // compute the sizes & places for each widget tk.setFullSize() me.baseGui.SetView(tk.cuiName, tk.gocuiSize.w0, tk.gocuiSize.h0, tk.gocuiSize.w1, tk.gocuiSize.h1, 0) diff --git a/eventMouseMove.go b/eventMouseMove.go index 8f68219..a1c9a89 100644 --- a/eventMouseMove.go +++ b/eventMouseMove.go @@ -98,6 +98,8 @@ func (tk *guiWidget) moveNew(g *gocui.Gui) { tk.verifyRect() s := fmt.Sprintf("move(%dx%d) %s WIN", w, h, tk.cuiName) */ + tk.gocuiSize.w0 = w + tk.gocuiSize.h0 = h tk.redrawWindow(w, h) s := fmt.Sprintf("move(%dx%d) %s WIN", w, h, tk.cuiName) tk.dumpWidget(s) diff --git a/place.go b/place.go index de20467..ddd488d 100644 --- a/place.go +++ b/place.go @@ -77,20 +77,25 @@ func (tk *guiWidget) placeWidgets(startW int, startH int) (int, int) { case widget.Window: newW := startW newH := startH - var maxH int = 0 + // var maxH int = 0 for _, child := range tk.children { child.placeWidgets(newW, newH) sizeW, sizeH := child.Size() - if sizeW < 20 { - sizeW = 20 - } + /* + if sizeW < 20 { + sizeW = 20 + } + */ newW += sizeW - if sizeH > maxH { - maxH = sizeH - } + newH += sizeH + /* + if sizeH > maxH { + maxH = sizeH + } + */ } - return newW - startW, maxH + return newW - startW, newH - startH case widget.Tab: case widget.Grid: return tk.placeGrid(startW, startH)