Wonkiness on layout

wdgt_checkbox.go

@@ -45,8 +45,8 @@ type Checkbox struct {
 	x, y      int
 	w, h      int
 
-	keyMap     KeyMap
-	stateRunes []rune
+	keyMap, customKeyMap KeyMap
+	stateRunes           []rune
 }
 
 var _ Widget = (*Checkbox)(nil)
@@ -69,20 +69,25 @@ func (w *Checkbox) Init(id string, style tcell.Style) {
 	w.AddToKeyMap(NewRuneMap(map[rune]func(ev *tcell.EventKey) bool{
 		' ': w.ToggleState,
 	}))
+	w.customKeyMap = BlankKeyMap()
 }
-func (w *Checkbox) Id() string { return w.id }
-func (w *Checkbox) HandleResize(ev *tcell.EventResize) {
-	w.w, w.h = ev.Size()
-}
+func (w *Checkbox) Id() string                         { return w.id }
+func (w *Checkbox) HandleResize(ev *tcell.EventResize) { w.w, w.h = ev.Size() }
 
-func (w *Checkbox) SetKeyMap(km KeyMap)   { w.keyMap = km }
-func (w *Checkbox) AddToKeyMap(km KeyMap) { w.keyMap.Merge(km) }
+func (w *Checkbox) SetKeyMap(km KeyMap, def bool) {
+	if def {
+		w.keyMap = km
+	} else {
+		w.customKeyMap = km
+	}
+}
+func (w *Checkbox) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
 func (w *Checkbox) 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)
 	}
 }
 
@@ -90,7 +95,9 @@ func (w *Checkbox) 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 *Checkbox) HandleTime(ev *tcell.EventTime) {}
 func (w *Checkbox) Draw(screen tcell.Screen) {