diff options
Diffstat (limited to 'toolkit/gocui/tab.go')
| -rw-r--r-- | toolkit/gocui/tab.go | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/toolkit/gocui/tab.go b/toolkit/gocui/tab.go index 18f6ec7..ecaf5fd 100644 --- a/toolkit/gocui/tab.go +++ b/toolkit/gocui/tab.go @@ -60,8 +60,10 @@ func (w *cuiWidget) setTabWH() { w.gocuiSize.w0 = me.rootNode.nextW w.gocuiSize.h0 = me.rootNode.nextH - w.realWidth = w.gocuiSize.width + me.FramePadW - w.realHeight = w.gocuiSize.height + me.FramePadH + if w.frame { + w.realWidth = w.gocuiSize.width + me.FramePadW + w.realHeight = w.gocuiSize.height + me.FramePadH + } // move the rootNode width over for the next window or tab me.rootNode.nextW += w.gocuiSize.width + me.TabPadW @@ -70,21 +72,6 @@ func (w *cuiWidget) setTabWH() { w.showWidgetPlacement(logNow, "setTabWH:") } -func (w *cuiWidget) setLabel() { - // set the start and size of the tab gocui button - t := len(w.text) - w.gocuiSize.width = t + me.buttonPadding - w.gocuiSize.height = 2 - w.gocuiSize.w0 = me.rootNode.nextW - w.gocuiSize.h0 = me.rootNode.nextH - - // move the rootNode width over for the next window or tab - me.rootNode.nextW += w.gocuiSize.width - - w.setWH() - w.showWidgetPlacement(logNow, "setLabel:") -} - func (w *cuiWidget) redoTabs(draw bool) { if (w.widgetType == toolkit.Window) { var tabs bool = false @@ -97,11 +84,10 @@ func (w *cuiWidget) redoTabs(draw bool) { if (tabs) { // window is tabs. Don't show it as a standard button w.frame = false - w.setLabel() } else { w.frame = true - w.setTabWH() } + w.setTabWH() w.deleteView() w.drawView() |