Some work

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) {
@@ -144,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 {
@@ -167,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_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 }
@@ -96,8 +95,6 @@ func (w *BorderedWidget) Active() bool           { return w.widget.Active() }
 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_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) {
@@ -140,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_form.go

@@ -148,9 +148,10 @@ 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
 				}
 			}
@@ -174,8 +170,6 @@ func (w *LinearLayout) SetActive(a bool) bool {
 }
 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 }
@@ -291,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
@@ -305,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_shrinkwrap.go

@@ -53,8 +53,6 @@ func (w *ShrinkWrap) SetActive(a bool) bool {
 }
 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_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
 				}
 			}
@@ -167,8 +165,6 @@ func (w *ScrollingWidgetList) SetActive(a bool) bool {
 }
 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 }
@@ -284,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
@@ -298,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_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()