From c16b8695332485071331bbcab924327cd2bab6e5 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 6 Apr 2023 11:19:04 -0500 Subject: gocui: more or less correct sizes init to normal state (debug=off) size handling cleanups keep trying to fix grid widget move towards cmdline/auto loading of gocui Signed-off-by: Jeff Carr --- toolkit/gocui/tab.go | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) (limited to 'toolkit/gocui/tab.go') diff --git a/toolkit/gocui/tab.go b/toolkit/gocui/tab.go index 7628333..cc00b6c 100644 --- a/toolkit/gocui/tab.go +++ b/toolkit/gocui/tab.go @@ -53,33 +53,20 @@ func (w *cuiWidget) showWidgets() { } func (w *cuiWidget) setTabWH() { + // set the start and size of the tab gocui button t := len(w.text) - w.gocuiSize.width = t + me.buttonPadding w.gocuiSize.height = me.defaultHeight + w.gocuiSize.w0 = me.rootNode.nextW + w.gocuiSize.h0 = me.rootNode.nextH - w.gocuiSize.startW = me.rootNode.startW - w.gocuiSize.startH = me.rootNode.startH + // move the rootNode width over for the next window or tab + me.rootNode.nextW += w.gocuiSize.width + me.padW w.startW = me.rawW w.startH = me.rawH - - var f func (widget *cuiWidget) - - // find buttons that are below where the mouse button click - f = func(widget *cuiWidget) { - if (widget == w) { - return - } - if ((widget.widgetType == toolkit.Window) || (widget.widgetType == toolkit.Tab)) { - w.gocuiSize.startW += widget.gocuiSize.width + me.padW - } - - for _, child := range widget.children { - f(child) - } - } - f(me.rootNode) + w.nextW = me.rawW + w.nextH = me.rawH w.setWH() w.showWidgetPlacement(logNow, "setTabWH:") -- cgit v1.2.3