Wonkiness on layout

wdgt_timefield.go

@@ -57,8 +57,8 @@ type TimeField struct {
 
 	widgets []Widget
 
-	cursor int
-	keyMap KeyMap
+	cursor               int
+	keyMap, customKeyMap KeyMap
 }
 
 // TODO: Allow changing the format.
@@ -91,6 +91,7 @@ func (w *TimeField) Init(id string, style tcell.Style) {
 		tcell.KeyHome: w.handleHome,
 		tcell.KeyEnd:  w.handleEnd,
 	})
+	w.customKeyMap = BlankKeyMap()
 	w.visible = true
 	w.focusable = true
 }
@@ -138,14 +139,20 @@ func (w *TimeField) HandleResize(ev *tcell.EventResize) {
 	}
 }
 
-func (w *TimeField) SetKeyMap(km KeyMap)   { w.keyMap = km }
-func (w *TimeField) AddToKeyMap(km KeyMap) { w.keyMap.Merge(km) }
+func (w *TimeField) SetKeyMap(km KeyMap, def bool) {
+	if def {
+		w.keyMap = km
+	} else {
+		w.customKeyMap = km
+	}
+}
+func (w *TimeField) AddToKeyMap(km KeyMap) { w.customKeyMap.Merge(km) }
 func (w *TimeField) 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)
 	}
 }
 
@@ -154,9 +161,12 @@ func (w *TimeField) HandleKey(ev *tcell.EventKey) bool {
 		return false
 	} else if ev.Key() == tcell.KeyTab {
 		return w.handleTab(ev)
-	} else if w.keyMap.Handle(ev) {
+	}
+	b1, b2 := w.keyMap.Handle(ev), w.customKeyMap.Handle(ev)
+	if b1 || b2 {
 		return true
-	} else if w.cursor <= len(w.widgets) {
+	}
+	if w.cursor <= len(w.widgets) {
 		return w.widgets[w.cursor].HandleKey(ev)
 	}
 	return false