Wonkiness on layout

wdgt_filepicker.go

@@ -50,7 +50,7 @@ type FilePicker struct {
 	fileList             *SimpleList
 	btnSelect, btnCancel *Button
 
-	keyMap KeyMap
+	keyMap, customKeyMap KeyMap
 }
 
 var _ Widget = (*FilePicker)(nil)
@@ -75,6 +75,7 @@ func (w *FilePicker) Init(id string, style tcell.Style) {
 	w.layout.Add(w.btnCancel, nil, RelAncBL)
 	w.focusable = true
 	w.keyMap = BlankKeyMap()
+	w.customKeyMap = BlankKeyMap()
 }
 func (w *FilePicker) Id() string { return w.id }
 func (w *FilePicker) HandleResize(ev *tcell.EventResize) {
@@ -84,14 +85,20 @@ func (w *FilePicker) HandleResize(ev *tcell.EventResize) {
 	w.btnCancel.SetPos(Coord{X: w.x + 1, Y: w.y + w.h - 1})
 }
 
-func (w *FilePicker) SetKeyMap(km KeyMap)   { w.keyMap = km }
-func (w *FilePicker) AddToKeyMap(km KeyMap) { w.keyMap.Merge(km) }
+func (w *FilePicker) SetKeyMap(km KeyMap, def bool) {
+	if def {
+		w.keyMap = km
+	} else {
+		w.customKeyMap = km
+	}
+}
+func (w *FilePicker) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
 func (w *FilePicker) 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)
 	}
 }
 
@@ -99,7 +106,9 @@ func (w *FilePicker) 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 *FilePicker) HandleTime(ev *tcell.EventTime) { w.layout.HandleTime(ev) }
 func (w *FilePicker) Draw(screen tcell.Screen) {