A few fixes
This commit is contained in:
@@ -62,6 +62,8 @@ func (w *TopMenuLayout) Init(id string, s tcell.Style) {
|
||||
w.menu.SetActive(false)
|
||||
w.menu.SetType(MenuTypeH)
|
||||
w.menu.SetTabbable(false)
|
||||
|
||||
w.widget = NewBlankWidget("blank")
|
||||
}
|
||||
|
||||
func (w *TopMenuLayout) Id() string { return w.id }
|
||||
@@ -84,6 +86,9 @@ func (w *TopMenuLayout) HandleKey(ev *tcell.EventKey) bool {
|
||||
}
|
||||
if ev.Key() == tcell.KeyEscape && w.menu != nil {
|
||||
w.menu.SetActive(!w.menu.Active())
|
||||
if w.widget != nil {
|
||||
w.widget.SetActive(!w.menu.Active())
|
||||
}
|
||||
return true
|
||||
}
|
||||
if w.menu.Active() {
|
||||
@@ -92,6 +97,7 @@ func (w *TopMenuLayout) HandleKey(ev *tcell.EventKey) bool {
|
||||
|
||||
// Pass the key through to the main widget
|
||||
if w.widget != nil {
|
||||
w.Log(" Passing Key to Main Widget")
|
||||
return w.widget.HandleKey(ev)
|
||||
}
|
||||
return false
|
||||
@@ -106,12 +112,12 @@ func (w *TopMenuLayout) Draw(screen tcell.Screen) {
|
||||
if !w.visible {
|
||||
return
|
||||
}
|
||||
if w.menu != nil {
|
||||
w.GetPos().DrawOffset(w.menu, screen)
|
||||
}
|
||||
if w.widget != nil {
|
||||
w.GetPos().DrawOffset(w.widget, screen)
|
||||
}
|
||||
if w.menu != nil {
|
||||
w.GetPos().DrawOffset(w.menu, screen)
|
||||
}
|
||||
}
|
||||
|
||||
func (w *TopMenuLayout) Active() bool { return w.active }
|
||||
|
||||
Reference in New Issue
Block a user