@@ -17,6 +17,7 @@ pub struct Info {
1717
1818impl Info {
1919 pub fn key(title: &'static str, body: Vec<(&[KeyEvent], &'static str)>) -> Info {
20+ let (lpad, mpad, rpad) = (1, 2, 1);
2021 let keymaps_width: u16 = body
2122 .iter()
2223 .map(|r| r.0.iter().map(|e| e.width() as u16 + 2).sum::<u16>() - 2)
@@ -28,18 +29,23 @@ impl Info {
2829 for (keyevents, desc) in body {
2930 let keyevent = keyevents[0];
3031 let mut left = keymaps_width - keyevent.width() as u16;
32+ for _ in 0..lpad {
33+ text.push(' ');
34+ }
3135 write!(text, "{}", keyevent).ok();
3236 for keyevent in &keyevents[1..] {
3337 write!(text, ", {}", keyevent).ok();
3438 left -= 2 + keyevent.width() as u16;
3539 }
36− for _ in 0..left {
40+ for _ in 0..left + mpad {
3741 text.push(' ');
3842 }
39− if keymaps_width + 2 + (desc.width() as u16) > width {
40− width = keymaps_width + 2 + desc.width() as u16;
43+ let desc = desc.trim();
44+ let w = lpad + keymaps_width + mpad + (desc.width() as u16) + rpad;
45+ if w > width {
46+ width = w;
4147 }
42− writeln!(text, " {}", &desc).ok();
48+ writeln!(text, "{}", desc).ok();
4349 }
4450 Info {
4551 title,