git.iko.soy/helix
on master help sign in
Info box add horizontal padding
916362dIvan Tham
helix-view/src/info.rs+10−4
compare with master
unifiedsplit
@@ -17,6 +17,7 @@ pub struct Info {
17
17
18impl Info {
18impl Info {
19 pub fn key(title: &'static str, body: Vec<(&[KeyEvent], &'static str)>) -> Info {
19 pub fn key(title: &'static str, body: Vec<(&[KeyEvent], &'static str)>) -> Info {
20+ let (lpad, mpad, rpad) = (1, 2, 1);
20 let keymaps_width: u16 = body
21 let keymaps_width: u16 = body
21 .iter()
22 .iter()
22 .map(|r| r.0.iter().map(|e| e.width() as u16 + 2).sum::<u16>() - 2)
23 .map(|r| r.0.iter().map(|e| e.width() as u16 + 2).sum::<u16>() - 2)
@@ -28,18 +29,23 @@ impl Info {
28 for (keyevents, desc) in body {
29 for (keyevents, desc) in body {
29 let keyevent = keyevents[0];
30 let keyevent = keyevents[0];
30 let mut left = keymaps_width - keyevent.width() as u16;
31 let mut left = keymaps_width - keyevent.width() as u16;
32+ for _ in 0..lpad {
33+ text.push(' ');
34+ }
31 write!(text, "{}", keyevent).ok();
35 write!(text, "{}", keyevent).ok();
32 for keyevent in &keyevents[1..] {
36 for keyevent in &keyevents[1..] {
33 write!(text, ", {}", keyevent).ok();
37 write!(text, ", {}", keyevent).ok();
34 left -= 2 + keyevent.width() as u16;
38 left -= 2 + keyevent.width() as u16;
35 }
39 }
36− for _ in 0..left {
40+ for _ in 0..left + mpad {
37 text.push(' ');
41 text.push(' ');
38 }
42 }
39− if keymaps_width + 2 + (desc.width() as u16) > width {
43+ let desc = desc.trim();
40− width = keymaps_width + 2 + desc.width() as u16;
44+ let w = lpad + keymaps_width + mpad + (desc.width() as u16) + rpad;
45+ if w > width {
46+ width = w;
41 }
47 }
42− writeln!(text, " {}", &desc).ok();
48+ writeln!(text, "{}", desc).ok();
43 }
49 }
44 Info {
50 Info {
45 title,
51 title,