Some work

layout_flags.go

@@ -75,6 +75,7 @@ const (
 	LFSizeAll = LayoutFlag(0x11110000)
 )
 
+func (f LayoutFlag) Has(fl LayoutFlag) bool { return f&fl != 0 }
 func (f LayoutFlag) Add(fl LayoutFlag)      { f |= fl }
 func (f LayoutFlag) Remove(fl LayoutFlag)   { f = f &^ fl }
 func (f LayoutFlag) ClearAll() {

wdgt_absolute_layout.go

@@ -94,8 +94,7 @@ func (w *AbsoluteLayout) HandleKey(ev *tcell.EventKey) bool {
 					continue
 				}
 			} else {
-				if w.widgets[i].Focusable() {
-					w.widgets[i].SetActive(true)
+				if w.widgets[i].SetActive(true) {
 					return true
 				}
 			}
@@ -105,8 +104,7 @@ func (w *AbsoluteLayout) HandleKey(ev *tcell.EventKey) bool {
 			return false
 		}
 		for i := 0; i < fndP; i++ {
-			if w.widgets[i].Focusable() {
-				w.widgets[i].SetActive(true)
+			if w.widgets[i].SetActive(true) {
 				return true
 			}
 		}
@@ -139,8 +137,12 @@ func (w *AbsoluteLayout) Draw(screen tcell.Screen) {
 	}
 }
 
+func (w *AbsoluteLayout) SetStyle(s tcell.Style) { w.style = s }
 func (w *AbsoluteLayout) Active() bool           { return w.active }
-func (w *AbsoluteLayout) SetActive(a bool)    { w.active = a }
+func (w *AbsoluteLayout) SetActive(a bool) bool {
+	w.active = a
+	return w.Active()
+}
 func (w *AbsoluteLayout) Visible() bool       { return w.visible }
 func (w *AbsoluteLayout) SetVisible(a bool)   { w.visible = a }
 func (w *AbsoluteLayout) Focusable() bool     { return w.focusable }

wdgt_alert.go

@@ -36,7 +36,6 @@ type Alert struct {
 	w, h    int
 	active  bool
 	visible bool
-	focusable bool
 
 	layout           *LinearLayout
 	title            string
@@ -90,7 +89,6 @@ func (w *Alert) Init(id string, style tcell.Style) {
 		NewKey(BuildEK(tcell.KeyUp), w.SelectNext),
 		NewKey(BuildEK(tcell.KeyEnter), w.Do),
 	)
-	w.focusable = true
 }
 func (w *Alert) Id() string { return w.id }
 func (w *Alert) HandleResize(ev *tcell.EventResize) {
@@ -125,8 +123,12 @@ func (w *Alert) Draw(screen tcell.Screen) {
 	w.GetPos().DrawOffset(w.layout, screen)
 }
 
+func (w *Alert) SetStyle(s tcell.Style) { w.style = s }
 func (w *Alert) Active() bool           { return w.active }
-func (w *Alert) SetActive(a bool)    { w.active = a }
+func (w *Alert) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *Alert) Visible() bool     { return w.visible }
 func (w *Alert) SetVisible(a bool) { w.visible = a }
 func (w *Alert) SetX(x int)        { w.x = x }
@@ -140,10 +142,15 @@ func (w *Alert) SetH(y int)          { w.h = y }
 func (w *Alert) GetW() int         { return w.w }
 func (w *Alert) GetH() int         { return w.y }
 func (w *Alert) SetSize(c Coord)   { w.w, w.h = c.X, c.Y }
-func (w *Alert) Focusable() bool     { return w.focusable }
-func (w *Alert) SetFocusable(b bool) { w.focusable = b }
 func (w *Alert) WantW() int {
-	return 4 + wh.Max(w.message.WantW(), (w.btnOk.WantW()+w.btnCancel.WantW()))
+	var okW, cancelW int
+	if !w.btnOk.Visible() {
+		okW = w.btnOk.WantW()
+	}
+	if !w.btnCancel.Visible() {
+		cancelW = w.btnCancel.WantW()
+	}
+	return 4 + wh.Max(w.message.WantW(), (okW+cancelW))
 }
 
 func (w *Alert) WantH() int {
@@ -163,13 +170,11 @@ func (w *Alert) SetMessage(msg string) { w.message.SetText(msg) }
 
 func (w *Alert) SetOkPressed(b func() bool) {
 	w.btnOk.SetVisible(b != nil)
-	w.btnOk.SetFocusable(b != nil)
 	w.btnOk.SetOnPressed(b)
 }
 
 func (w *Alert) SetCancelPressed(b func() bool) {
 	w.btnCancel.SetVisible(b != nil)
-	w.btnCancel.SetFocusable(b != nil)
 	w.btnCancel.SetOnPressed(b)
 }
 

wdgt_asciiarttext.go

@@ -80,8 +80,12 @@ func (w *ArtWidget) Draw(screen tcell.Screen) {
 	w.buffer.Draw(w.x, w.y, screen)
 }
 
+func (w *ArtWidget) SetStyle(s tcell.Style) { w.style = s }
 func (w *ArtWidget) Active() bool           { return w.active }
-func (w *ArtWidget) SetActive(a bool)    { w.active = a }
+func (w *ArtWidget) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *ArtWidget) Visible() bool       { return w.visible }
 func (w *ArtWidget) SetVisible(v bool)   { w.visible = v }
 func (w *ArtWidget) Focusable() bool     { return w.focusable }

wdgt_blank.go

@@ -51,8 +51,9 @@ func (w *BlankWidget) HandleKey(ev *tcell.EventKey) bool  { return false }
 func (w *BlankWidget) HandleTime(ev *tcell.EventTime)     {}
 func (w *BlankWidget) Draw(screen tcell.Screen)           {}
 
+func (w *BlankWidget) SetStyle(s tcell.Style) {}
 func (w *BlankWidget) Active() bool           { return false }
-func (w *BlankWidget) SetActive(a bool)    {}
+func (w *BlankWidget) SetActive(a bool) bool  { return false }
 func (w *BlankWidget) Visible() bool          { return true }
 func (w *BlankWidget) SetVisible(v bool)      {}
 func (w *BlankWidget) Focusable() bool        { return false }

wdgt_bordered.go

@@ -58,7 +58,6 @@ func (w *BorderedWidget) Init(id string, s tcell.Style) {
 	w.style = s
 	w.widget.SetVisible(true)
 	w.border = wh.BRD_CSIMPLE
-	w.widget.SetFocusable(true)
 }
 
 func (w *BorderedWidget) Id() string { return w.id }
@@ -91,12 +90,11 @@ func (w *BorderedWidget) Draw(screen tcell.Screen) {
 	w.GetPos().DrawOffset(w.widget, screen)
 }
 
+func (w *BorderedWidget) SetStyle(s tcell.Style) { w.style = s }
 func (w *BorderedWidget) Active() bool           { return w.widget.Active() }
-func (w *BorderedWidget) SetActive(a bool)    { w.widget.SetActive(a) }
+func (w *BorderedWidget) SetActive(a bool) bool  { return w.widget.SetActive(a) }
 func (w *BorderedWidget) Visible() bool          { return w.widget.Visible() }
 func (w *BorderedWidget) SetVisible(a bool)      { w.SetVisible(a) }
-func (w *BorderedWidget) Focusable() bool     { return w.widget.Focusable() }
-func (w *BorderedWidget) SetFocusable(b bool) { w.widget.SetFocusable(b) }
 func (w *BorderedWidget) SetX(x int)             { w.x = x }
 func (w *BorderedWidget) SetY(y int)             { w.y = y }
 func (w *BorderedWidget) GetX() int              { return w.x }

wdgt_buffer.go

@@ -75,8 +75,13 @@ func (w *BufferWidget) HandleKey(ev *tcell.EventKey) bool {
 }
 func (w *BufferWidget) HandleTime(ev *tcell.EventTime) { w.timeMap.Handle(ev) }
 func (w *BufferWidget) Draw(screen tcell.Screen)       { w.buffer.Draw(w.x, w.y, screen) }
+
+func (w *BufferWidget) SetStyle(s tcell.Style) { w.style = s }
 func (w *BufferWidget) Active() bool           { return w.active }
-func (w *BufferWidget) SetActive(a bool)               { w.active = a }
+func (w *BufferWidget) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *BufferWidget) Visible() bool       { return w.visible }
 func (w *BufferWidget) SetVisible(a bool)   { w.visible = a }
 func (w *BufferWidget) Focusable() bool     { return w.focusable }

wdgt_button.go

@@ -38,7 +38,6 @@ type Button struct {
 
 	active  bool
 	visible bool
-	focusable bool
 	keyMap  *KeyMap
 
 	onPressed func() bool
@@ -59,7 +58,6 @@ func (w *Button) Init(id string, style tcell.Style) {
 	w.visible = true
 	w.keyMap = NewKeyMap(NewKey(BuildEK(tcell.KeyEnter), func(ev *tcell.EventKey) bool { return w.onPressed() }))
 	w.onPressed = func() bool { return false }
-	w.focusable = true
 }
 func (w *Button) Id() string { return w.id }
 func (w *Button) HandleResize(ev *tcell.EventResize) {
@@ -119,8 +117,12 @@ func (w *Button) Draw(screen tcell.Screen) {
 	wh.DrawText(w.x, w.y+2, fmt.Sprintf("╰%s╯", strings.Repeat("─", w.w-2)), dStyle, screen)
 }
 
+func (w *Button) SetStyle(s tcell.Style) { w.style = s }
 func (w *Button) Active() bool           { return w.active }
-func (w *Button) SetActive(a bool)    { w.active = a }
+func (w *Button) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *Button) Visible() bool     { return w.visible }
 func (w *Button) SetVisible(a bool) { w.visible = a }
 func (w *Button) SetX(x int)        { w.x = x }
@@ -136,8 +138,6 @@ func (w *Button) GetH() int           { return w.h }
 func (w *Button) WantW() int        { return 4 + len(w.label) }
 func (w *Button) WantH() int        { return 3 }
 func (w *Button) SetSize(c Coord)   { w.w, w.h = c.X, c.Y }
-func (w *Button) Focusable() bool     { return w.focusable }
-func (w *Button) SetFocusable(b bool) { w.focusable = b }
 func (w *Button) MinW() int         { return len(w.label) + 2 }
 func (w *Button) MinH() int         { return 1 }
 

wdgt_chat.go

@@ -158,8 +158,12 @@ func (w *Chat) Draw(screen tcell.Screen) {
 	// x += len(post) - 1
 }
 
+func (w *Chat) SetStyle(s tcell.Style) { w.style = s }
 func (w *Chat) Active() bool           { return w.active }
-func (w *Chat) SetActive(a bool)    { w.active = a }
+func (w *Chat) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *Chat) Visible() bool       { return w.visible }
 func (w *Chat) SetVisible(a bool)   { w.visible = a }
 func (w *Chat) Focusable() bool     { return w.focusable }

wdgt_checkbox.go

@@ -92,8 +92,12 @@ func (w *Checkbox) Draw(screen tcell.Screen) {
 	wh.DrawText(w.x, w.y, fmt.Sprintf("[%s] %s", string(w.stateRunes[w.state]), w.label), dStyle, screen)
 }
 
+func (w *Checkbox) SetStyle(s tcell.Style) { w.style = s }
 func (w *Checkbox) Active() bool           { return w.active }
-func (w *Checkbox) SetActive(a bool)  { w.active = a }
+func (w *Checkbox) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *Checkbox) Visible() bool     { return w.visible }
 func (w *Checkbox) SetVisible(a bool) { w.visible = a }
 func (w *Checkbox) SetX(x int)        { w.x = x }

wdgt_cli.go

@@ -172,8 +172,12 @@ func (w *Cli) Draw(screen tcell.Screen) {
 	wh.DrawText(x, y, wh.PadR(post, w.w-x-2), dStyle, screen)
 }
 
+func (w *Cli) SetStyle(s tcell.Style) { w.style = s }
 func (w *Cli) Active() bool           { return w.active }
-func (w *Cli) SetActive(a bool)    { w.active = a }
+func (w *Cli) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *Cli) Visible() bool       { return w.visible }
 func (w *Cli) SetVisible(a bool)   { w.visible = a }
 func (w *Cli) Focusable() bool     { return true }

wdgt_datepicker.go

@@ -129,13 +129,15 @@ func (w *DatePicker) Draw(screen tcell.Screen) {
 	w.GetPos().DrawOffset(w.dateNow, screen)
 }
 
+func (w *DatePicker) SetStyle(s tcell.Style) { w.style = s }
 func (w *DatePicker) Active() bool           { return w.active }
-func (w *DatePicker) SetActive(a bool) {
+func (w *DatePicker) SetActive(a bool) bool {
 	if !w.active && a {
 		// Wasn't active, but turning on
 		w.dateFld.SetActive(true)
 	}
 	w.active = a
+	return w.active
 }
 func (w *DatePicker) Visible() bool       { return w.visible }
 func (w *DatePicker) SetVisible(a bool)   { w.visible = a }

wdgt_debug.go

@@ -165,10 +165,11 @@ func (w *DebugWidget) Draw(screen tcell.Screen) {
 	w.GetPos().DrawOffset(w.widget, screen)
 }
 
+func (w *DebugWidget) SetStyle(s tcell.Style) { w.style = s }
 func (w *DebugWidget) Active() bool           { return w.active }
-func (w *DebugWidget) SetActive(a bool) {
+func (w *DebugWidget) SetActive(a bool) bool {
 	w.active = a
-	w.widget.SetActive(a)
+	return w.widget.SetActive(a)
 }
 func (w *DebugWidget) Visible() bool       { return w.visible }
 func (w *DebugWidget) SetVisible(a bool)   { w.visible = a }

wdgt_field.go

@@ -155,8 +155,12 @@ func (w *Field) Draw(screen tcell.Screen) {
 	wh.DrawText(x, w.y, post, valueStyle, screen)
 }
 
+func (w *Field) SetStyle(s tcell.Style) { w.style = s }
 func (w *Field) Active() bool           { return w.active }
-func (w *Field) SetActive(a bool)  { w.active = a }
+func (w *Field) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *Field) Visible() bool     { return w.visible }
 func (w *Field) SetVisible(a bool) { w.visible = a }
 func (w *Field) SetX(x int)        { w.x = x }

wdgt_filepicker.go

@@ -121,8 +121,12 @@ func (w *FilePicker) Draw(screen tcell.Screen) {
 	p.DrawOffset(w.btnSelect, screen)
 }
 
+func (w *FilePicker) SetStyle(s tcell.Style) { w.style = s }
 func (w *FilePicker) Active() bool           { return w.active }
-func (w *FilePicker) SetActive(a bool)    { w.active = a }
+func (w *FilePicker) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *FilePicker) Visible() bool       { return w.visible }
 func (w *FilePicker) SetVisible(a bool)   { w.visible = a }
 func (w *FilePicker) SetX(x int)          { w.x = x }

wdgt_form.go

@@ -146,10 +146,12 @@ func (w *Form) Draw(screen tcell.Screen) {
 	}
 }
 
+func (w *Form) SetStyle(s tcell.Style) { w.style = s }
 func (w *Form) Active() bool           { return w.active }
-func (w *Form) SetActive(a bool) {
+func (w *Form) SetActive(a bool) bool {
 	w.active = a
 	w.updateWidgets()
+	return w.active
 }
 func (w *Form) Visible() bool     { return w.visible }
 func (w *Form) SetVisible(a bool) { w.visible = a }

wdgt_linear_layout.go

@@ -52,7 +52,6 @@ type LinearLayout struct {
 
 	active      bool
 	visible     bool
-	focusable   bool
 	disableTab  bool
 	insetBorder bool
 
@@ -80,7 +79,6 @@ func (w *LinearLayout) Init(id string, s tcell.Style) {
 	w.id = id
 	w.style = s
 	w.visible = true
-	w.focusable = true
 	w.defFlags = LayoutFlag(LFAlignHCenter | LFAlignVCenter)
 	w.layoutFlags = make(map[Widget]LayoutFlag)
 	w.layoutWeights = make(map[Widget]int)
@@ -89,8 +87,7 @@ func (w *LinearLayout) Init(id string, s tcell.Style) {
 		if active == nil && len(w.widgets) > 0 {
 			// No widget is active, but we do have some
 			for i := range w.widgets {
-				if w.widgets[i].Focusable() {
-					w.widgets[i].SetActive(true)
+				if w.widgets[i].SetActive(true) {
 					return true
 				}
 			}
@@ -103,8 +100,7 @@ func (w *LinearLayout) Init(id string, s tcell.Style) {
 		if active == nil && len(w.widgets) > 0 {
 			// No widget is active, but we do have some
 			for i := len(w.widgets) - 1; i >= 0; i-- {
-				if w.widgets[i].Focusable() {
-					w.widgets[i].SetActive(true)
+				if w.widgets[i].SetActive(true) {
 					return true
 				}
 			}
@@ -160,8 +156,9 @@ func (w *LinearLayout) Draw(screen tcell.Screen) {
 	}
 }
 
+func (w *LinearLayout) SetStyle(s tcell.Style) { w.style = s }
 func (w *LinearLayout) Active() bool           { return w.active }
-func (w *LinearLayout) SetActive(a bool) {
+func (w *LinearLayout) SetActive(a bool) bool {
 	w.active = a
 	if w.active {
 		act := w.findActiveOrFirst()
@@ -169,11 +166,10 @@ func (w *LinearLayout) SetActive(a bool) {
 			act.SetActive(true)
 		}
 	}
+	return w.active
 }
 func (w *LinearLayout) Visible() bool     { return w.visible }
 func (w *LinearLayout) SetVisible(a bool) { w.visible = a }
-func (w *LinearLayout) Focusable() bool     { return w.focusable }
-func (w *LinearLayout) SetFocusable(b bool) { w.focusable = b }
 func (w *LinearLayout) SetX(x int)        { w.x = x }
 func (w *LinearLayout) SetY(y int)        { w.y = y }
 func (w *LinearLayout) GetX() int         { return w.x }
@@ -289,8 +285,7 @@ func (w *LinearLayout) ActivateWidget(n Widget) {
 func (w *LinearLayout) ActivateNext() bool {
 	var found bool
 	for i := range w.widgets {
-		if found && w.widgets[i].Focusable() {
-			w.widgets[i].SetActive(true)
+		if found && w.widgets[i].SetActive(true) {
 			return true
 		} else if w.widgets[i].Active() {
 			found = true
@@ -303,8 +298,7 @@ func (w *LinearLayout) ActivateNext() bool {
 func (w *LinearLayout) ActivatePrev() bool {
 	var found bool
 	for i := len(w.widgets) - 1; i >= 0; i-- {
-		if found && w.widgets[i].Focusable() {
-			w.widgets[i].SetActive(true)
+		if found && w.widgets[i].SetActive(true) {
 			return true
 		} else if w.widgets[i].Active() {
 			found = true

wdgt_menu.go

@@ -224,8 +224,13 @@ func (w *Menu) drawVMenu(screen tcell.Screen) {
 		y++
 	}
 }
+
+func (w *Menu) SetStyle(s tcell.Style) { w.style = s }
 func (w *Menu) Active() bool           { return w.active }
-func (w *Menu) SetActive(a bool)    { w.active = a }
+func (w *Menu) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *Menu) Visible() bool       { return w.visible }
 func (w *Menu) SetVisible(a bool)   { w.visible = a }
 func (w *Menu) SetX(x int)          { w.x = x }

wdgt_menu_item.go

@@ -197,12 +197,14 @@ func (w *MenuItem) Draw(screen tcell.Screen) {
 	}
 }
 
+func (w *MenuItem) SetStyle(s tcell.Style) { w.style = s }
 func (w *MenuItem) Active() bool           { return w.active }
-func (w *MenuItem) SetActive(a bool) {
+func (w *MenuItem) SetActive(a bool) bool {
 	w.active = a
 	if !w.manualExpand {
 		w.expanded = a
 	}
+	return w.active
 }
 func (w *MenuItem) Visible() bool     { return w.visible }
 func (w *MenuItem) SetVisible(a bool) { w.visible = a }

wdgt_prompt.go

@@ -114,8 +114,12 @@ func (w *Prompt) Draw(screen tcell.Screen) {
 	w.GetPos().DrawOffset(w.btnCancel, screen)
 }
 
+func (w *Prompt) SetStyle(s tcell.Style) { w.style = s }
 func (w *Prompt) Active() bool           { return w.active }
-func (w *Prompt) SetActive(a bool)    { w.active = a }
+func (w *Prompt) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *Prompt) Visible() bool       { return w.visible }
 func (w *Prompt) SetVisible(a bool)   { w.visible = a }
 func (w *Prompt) SetX(x int)          { w.x = x }

wdgt_relative_layout.go

@@ -112,8 +112,12 @@ func (w *RelativeLayout) Draw(screen tcell.Screen) {
 	*/
 }
 
+func (w *RelativeLayout) SetStyle(s tcell.Style) { w.style = s }
 func (w *RelativeLayout) Active() bool           { return w.active }
-func (w *RelativeLayout) SetActive(a bool)    { w.active = a }
+func (w *RelativeLayout) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *RelativeLayout) Visible() bool       { return w.visible }
 func (w *RelativeLayout) SetVisible(a bool)   { w.visible = a }
 func (w *RelativeLayout) Focusable() bool     { return w.focusable }

wdgt_searcher.go

@@ -257,10 +257,12 @@ func (w *Searcher) buildBuffer() {
 	w.buffer = b
 }
 
+func (w *Searcher) SetStyle(s tcell.Style) { w.style = s }
 func (w *Searcher) Active() bool           { return w.active }
-func (w *Searcher) SetActive(a bool) {
+func (w *Searcher) SetActive(a bool) bool {
 	w.active = a
 	w.search.SetActive(a)
+	return w.active
 }
 func (w *Searcher) Visible() bool     { return w.visible }
 func (w *Searcher) SetVisible(a bool) { w.visible = a }

wdgt_shrinkwrap.go

@@ -46,12 +46,13 @@ func (w *ShrinkWrap) HandleKey(ev *tcell.EventKey) bool { return w.widget.Handle
 func (w *ShrinkWrap) HandleTime(ev *tcell.EventTime)    { w.widget.HandleTime(ev) }
 func (w *ShrinkWrap) Draw(screen tcell.Screen)          { w.widget.Draw(screen) }
 
+func (w *ShrinkWrap) SetStyle(s tcell.Style) { w.widget.SetStyle(s) }
 func (w *ShrinkWrap) Active() bool           { return w.widget.Active() }
-func (w *ShrinkWrap) SetActive(a bool)    { w.widget.SetActive(a) }
+func (w *ShrinkWrap) SetActive(a bool) bool {
+	return w.widget.SetActive(a)
+}
 func (w *ShrinkWrap) Visible() bool      { return w.widget.Visible() }
 func (w *ShrinkWrap) SetVisible(v bool)  { w.widget.SetVisible(v) }
-func (w *ShrinkWrap) Focusable() bool     { return w.widget.Focusable() }
-func (w *ShrinkWrap) SetFocusable(t bool) { w.widget.SetFocusable(t) }
 func (w *ShrinkWrap) SetX(x int)         { w.widget.SetX(x) }
 func (w *ShrinkWrap) SetY(y int)         { w.widget.SetY(y) }
 func (w *ShrinkWrap) GetX() int          { return w.widget.GetX() }

wdgt_simple_list.go

@@ -185,8 +185,12 @@ func (w *SimpleList) Draw(screen tcell.Screen) {
 	}
 }
 
+func (w *SimpleList) SetStyle(s tcell.Style) { w.style = s }
 func (w *SimpleList) Active() bool           { return w.active }
-func (w *SimpleList) SetActive(a bool)    { w.active = a }
+func (w *SimpleList) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *SimpleList) Visible() bool       { return w.visible }
 func (w *SimpleList) SetVisible(a bool)   { w.visible = a }
 func (w *SimpleList) SetX(x int)          { w.x = x }
@@ -226,6 +230,12 @@ func (w *SimpleList) MinW() int {
 
 func (w *SimpleList) MinH() int { return 4 }
 
+func (w *SimpleList) getItemAt(idx int) {
+	for idx >= len(w.list) {
+		idx--
+	}
+
+}
 func (w *SimpleList) SetCursorWrap(b bool) { w.cursorWrap = b }
 func (w *SimpleList) MoveUp() bool {
 	if w.cursor > 0 {
@@ -327,7 +337,12 @@ func (w *SimpleList) SetItem(idx int, txt string) {
 		w.list[idx] = txt
 	}
 }
-func (w *SimpleList) SelectedIndex() int { return w.cursor }
+func (w *SimpleList) SelectedIndex() int {
+	if w.cursor >= len(w.list) {
+		w.cursor = len(w.list) - 1
+	}
+	return w.cursor
+}
 func (w *SimpleList) SetSelectedIndex(i int) {
 	if i < 0 {
 		i = 0
@@ -349,6 +364,11 @@ func (w *SimpleList) Log(txt string, args ...any) {
 
 func (w *SimpleList) SetOnChange(c func(int, string) bool) { w.onChange = c }
 
-func (w *SimpleList) GetSelectedItem() string               { return w.list[w.cursor] }
+func (w *SimpleList) GetSelectedItem() string {
+	if w.cursor >= len(w.list) {
+		w.cursor = len(w.list) - 1
+	}
+	return w.list[w.cursor]
+}
 func (w *SimpleList) GetAllItems() []string                 { return w.list }
 func (w *SimpleList) GetAllItemStyles() map[int]tcell.Style { return w.itemsStyle }

wdgt_simplelistwithhelp.go

@@ -84,10 +84,11 @@ func (w *SimpleListWithHelp) Draw(screen tcell.Screen) {
 	w.GetPos().DrawOffset(w.help, screen)
 }
 
+func (w *SimpleListWithHelp) SetStyle(s tcell.Style) { w.style = s }
 func (w *SimpleListWithHelp) Active() bool           { return w.list.Active() }
-func (w *SimpleListWithHelp) SetActive(a bool) {
-	w.list.SetActive(a)
+func (w *SimpleListWithHelp) SetActive(a bool) bool {
 	w.help.SetVisible(a)
+	return w.list.SetActive(a)
 }
 func (w *SimpleListWithHelp) Visible() bool       { return w.visible }
 func (w *SimpleListWithHelp) SetVisible(a bool)   { w.visible = a }

wdgt_spinner.go

@@ -78,8 +78,9 @@ func (w *Spinner) Draw(screen tcell.Screen) {
 	screen.SetContent(w.x, w.y, w.frames[w.currentFrame], nil, w.style)
 }
 
+func (w *Spinner) SetStyle(s tcell.Style) { w.style = s }
 func (w *Spinner) Active() bool           { return false }
-func (w *Spinner) SetActive(a bool)    {}
+func (w *Spinner) SetActive(a bool) bool  { return false }
 func (w *Spinner) Visible() bool          { return w.visible }
 func (w *Spinner) SetVisible(v bool)      { w.visible = v }
 func (w *Spinner) Focusable() bool        { return false }

wdgt_stacked_layout.go

@@ -79,8 +79,7 @@ func (w *ScrollingWidgetList) Init(id string, s tcell.Style) {
 		if active == nil && len(w.widgets) > 0 {
 			// No widget is active, but we do have some
 			for i := range w.widgets {
-				if w.widgets[i].Focusable() {
-					w.widgets[i].SetActive(true)
+				if w.widgets[i].SetActive(true) {
 					return true
 				}
 			}
@@ -93,8 +92,7 @@ func (w *ScrollingWidgetList) Init(id string, s tcell.Style) {
 		if active == nil && len(w.widgets) > 0 {
 			// No widget is active, but we do have some
 			for i := len(w.widgets) - 1; i >= 0; i-- {
-				if w.widgets[i].Focusable() {
-					w.widgets[i].SetActive(true)
+				if w.widgets[i].SetActive(true) {
 					return true
 				}
 			}
@@ -153,8 +151,9 @@ func (w *ScrollingWidgetList) Draw(screen tcell.Screen) {
 	}
 }
 
+func (w *ScrollingWidgetList) SetStyle(s tcell.Style) { w.style = s }
 func (w *ScrollingWidgetList) Active() bool           { return w.active }
-func (w *ScrollingWidgetList) SetActive(a bool) {
+func (w *ScrollingWidgetList) SetActive(a bool) bool {
 	w.active = a
 	if w.active {
 		act := w.findActiveOrFirst()
@@ -162,11 +161,10 @@ func (w *ScrollingWidgetList) SetActive(a bool) {
 			act.SetActive(true)
 		}
 	}
+	return w.active
 }
 func (w *ScrollingWidgetList) Visible() bool     { return w.visible }
 func (w *ScrollingWidgetList) SetVisible(a bool) { w.visible = a }
-func (w *ScrollingWidgetList) Focusable() bool     { return w.focusable }
-func (w *ScrollingWidgetList) SetFocusable(b bool) { w.focusable = b }
 func (w *ScrollingWidgetList) SetX(x int)        { w.x = x }
 func (w *ScrollingWidgetList) SetY(y int)        { w.y = y }
 func (w *ScrollingWidgetList) GetX() int         { return w.x }
@@ -282,8 +280,7 @@ func (w *ScrollingWidgetList) ActivateWidget(n Widget) {
 func (w *ScrollingWidgetList) ActivateNext() bool {
 	var found bool
 	for i := range w.widgets {
-		if found && w.widgets[i].Focusable() {
-			w.widgets[i].SetActive(true)
+		if found && w.widgets[i].SetActive(true) {
 			return true
 		} else if w.widgets[i].Active() {
 			found = true
@@ -296,8 +293,7 @@ func (w *ScrollingWidgetList) ActivateNext() bool {
 func (w *ScrollingWidgetList) ActivatePrev() bool {
 	var found bool
 	for i := len(w.widgets) - 1; i >= 0; i-- {
-		if found && w.widgets[i].Focusable() {
-			w.widgets[i].SetActive(true)
+		if found && w.widgets[i].SetActive(true) {
 			return true
 		} else if w.widgets[i].Active() {
 			found = true

wdgt_table.go

@@ -149,8 +149,12 @@ func (w *Table) Draw(screen tcell.Screen) {
 	}
 }
 
+func (w *Table) SetStyle(s tcell.Style) { w.style = s }
 func (w *Table) Active() bool           { return w.active }
-func (w *Table) SetActive(a bool)  { w.active = a }
+func (w *Table) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *Table) Visible() bool     { return w.visible }
 func (w *Table) SetVisible(a bool) { w.visible = a }
 func (w *Table) SetX(x int)        { w.x = x }

wdgt_text.go

@@ -82,8 +82,12 @@ func (w *Text) Draw(screen tcell.Screen) {
 	}
 }
 
+func (w *Text) SetStyle(s tcell.Style) { w.style = s }
 func (w *Text) Active() bool           { return w.active }
-func (w *Text) SetActive(a bool)    { w.active = a }
+func (w *Text) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *Text) Visible() bool       { return w.visible }
 func (w *Text) SetVisible(a bool)   { w.visible = a }
 func (w *Text) SetX(x int)          { w.x = x }

wdgt_timefield.go

@@ -181,8 +181,12 @@ func (w *TimeField) Draw(screen tcell.Screen) {
 	}
 }
 
+func (w *TimeField) SetStyle(s tcell.Style) { w.style = s }
 func (w *TimeField) Active() bool           { return w.active }
-func (w *TimeField) SetActive(a bool)    { w.active = a }
+func (w *TimeField) SetActive(a bool) bool {
+	w.active = a
+	return w.active
+}
 func (w *TimeField) Visible() bool       { return w.visible }
 func (w *TimeField) SetVisible(a bool)   { w.visible = a }
 func (w *TimeField) SetX(x int)          { w.x = x }

wdgt_top_menu_layout.go

@@ -89,6 +89,28 @@ func (w *TopMenuLayout) ToggleMenu() bool {
 	return false
 }
 
+func (w *TopMenuLayout) ShowMenu() bool {
+	if w.menu != nil {
+		w.menu.SetActive(true)
+		if w.widget != nil {
+			w.widget.SetActive(false)
+		}
+		return true
+	}
+	return false
+}
+
+func (w *TopMenuLayout) HideMenu() bool {
+	if w.menu != nil {
+		w.menu.SetActive(false)
+		if w.widget != nil {
+			w.widget.SetActive(true)
+		}
+		return true
+	}
+	return false
+}
+
 func (w *TopMenuLayout) Id() string { return w.id }
 func (w *TopMenuLayout) HandleResize(ev *tcell.EventResize) {
 	w.w, w.h = ev.Size()
@@ -158,12 +180,14 @@ func (w *TopMenuLayout) Draw(screen tcell.Screen) {
 	}
 }
 
+func (w *TopMenuLayout) SetStyle(s tcell.Style) { w.style = s }
 func (w *TopMenuLayout) Active() bool           { return w.active }
-func (w *TopMenuLayout) SetActive(a bool) {
+func (w *TopMenuLayout) SetActive(a bool) bool {
 	w.active = a
 	if w.widget != nil {
 		w.widget.SetActive(a)
 	}
+	return w.active
 }
 func (w *TopMenuLayout) Visible() bool       { return w.visible }
 func (w *TopMenuLayout) SetVisible(a bool)   { w.visible = a }

widget.go

@@ -38,12 +38,11 @@ type Widget interface {
 	SetKeyMap(km *KeyMap)
 
 	Draw(tcell.Screen)
+	SetStyle(tcell.Style)
 	Active() bool
-	SetActive(bool)
+	SetActive(bool) bool
 	Visible() bool
 	SetVisible(bool)
-	Focusable() bool
-	SetFocusable(bool)
 	SetX(int)
 	SetY(int)
 	GetX() int