Wonkiness on layout

This commit is contained in:
2025-10-10 16:46:29 -05:00
parent 79a212e601
commit 7a1afd67ac
28 changed files with 362 additions and 156 deletions

View File

@@ -44,7 +44,8 @@ type Alert struct {
btnLayout *LinearLayout
btnOk, btnCancel *Button
keyMap KeyMap
keyMap, customKeyMap KeyMap
logger func(string, ...any)
}
@@ -89,6 +90,7 @@ func (w *Alert) Init(id string, style tcell.Style) {
tcell.KeyUp: w.SelectNext,
tcell.KeyEnter: w.Do,
})
w.customKeyMap = BlankKeyMap()
w.focusable = true
}
func (w *Alert) Id() string { return w.id }
@@ -99,14 +101,26 @@ func (w *Alert) HandleResize(ev *tcell.EventResize) {
w.layout.HandleResize(tcell.NewEventResize(w.w-2, w.h-2))
}
func (w *Alert) SetKeyMap(km KeyMap) { w.keyMap = km }
func (w *Alert) AddToKeyMap(km KeyMap) { w.keyMap.Merge(km) }
func (w *Alert) SetKeyMap(km KeyMap, def bool) {
if def {
w.keyMap = km
} else {
w.customKeyMap = km
}
}
func (w *Alert) AddToKeyMap(km KeyMap) {
w.customKeyMap.Merge(km)
}
func (w *Alert) RemoveFromKeyMap(km KeyMap) {
for k := range km.Keys {
w.keyMap.Remove(k)
w.customKeyMap.Remove(k)
}
for r := range km.Runes {
w.keyMap.RemoveRune(r)
w.customKeyMap.RemoveRune(r)
}
}
@@ -114,7 +128,9 @@ func (w *Alert) HandleKey(ev *tcell.EventKey) bool {
if !w.active {
return false
}
return w.keyMap.Handle(ev)
b1 := w.keyMap.Handle(ev)
b2 := w.customKeyMap.Handle(ev)
return b1 || b2
}
func (w *Alert) HandleTime(ev *tcell.EventTime) {