Wonkiness on layout

wdgt_menu_item.go

@@ -51,7 +51,7 @@ type MenuItem struct {
 	expanded     bool
 	disabled     bool
 
-	keyMap KeyMap
+	keyMap, customKeyMap KeyMap
 }
 
 var _ Widget = (*MenuItem)(nil)
@@ -78,6 +78,8 @@ func (w *MenuItem) Init(id string, style tcell.Style) {
 			return false
 		},
 	})
+	w.customKeyMap = BlankKeyMap()
+
 	for i := range w.items {
 		w.items[i].SetActive(i == w.cursor)
 	}
@@ -89,14 +91,20 @@ func (w *MenuItem) HandleResize(ev *tcell.EventResize) {
 	// TODO: Trickle-down HandleResize
 }
 
-func (w *MenuItem) SetKeyMap(km KeyMap)   { w.keyMap = km }
-func (w *MenuItem) AddToKeyMap(km KeyMap) { w.keyMap.Merge(km) }
+func (w *MenuItem) SetKeyMap(km KeyMap, def bool) {
+	if def {
+		w.keyMap = km
+	} else {
+		w.customKeyMap = km
+	}
+}
+func (w *MenuItem) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
 func (w *MenuItem) 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)
 	}
 }
 
@@ -119,7 +127,8 @@ func (w *MenuItem) HandleKey(ev *tcell.EventKey) bool {
 		}
 	}
 	// Look for a sub-item that's selected
-	return w.keyMap.Handle(ev)
+	b1, b2 := w.keyMap.Handle(ev), w.customKeyMap.Handle(ev)
+	return b1 || b2
 }
 
 func (w *MenuItem) HandleTime(ev *tcell.EventTime) {