diff --git a/input/src/input_dsl.rs b/input/src/input_dsl.rs index 4575e24..cde5a15 100644 --- a/input/src/input_dsl.rs +++ b/input/src/input_dsl.rs @@ -51,19 +51,19 @@ impl<'state, S, C: DslCommand<'state, S>, I: DslInput> KeyMap<'state, S, C, I> f while let Some(next) = iter.next() { match next { Token { value: Value::Exp(0, exp_iter), .. } => { - let mut e = exp_iter.clone(); - match e.next() { + let mut exp_iter = exp_iter.clone(); + match exp_iter.next() { Some(Token { value: Value::Sym(binding), .. }) => { if input.matches_dsl(binding) { - if let Some(command) = C::try_from_expr(state, &mut e) { + if let Some(command) = C::try_from_expr(state, &mut exp_iter) { return Some(command) } } }, - _ => panic!("invalid config (expected symbol, got: {exp_iter:?})") + _ => panic!("invalid config (expected symbol)") } }, - _ => panic!("invalid config (expected expression, got: {next:?})") + _ => panic!("invalid config (expected expression)") } } None diff --git a/output/src/ops/stack.rs b/output/src/ops/stack.rs deleted file mode 100644 index ba8b949..0000000 --- a/output/src/ops/stack.rs +++ /dev/null @@ -1,18 +0,0 @@ -/*Stack::down(|add|{ - let mut i = 0; - for (_, name) in self.dirs.iter() { - if i >= self.scroll { - add(&Tui::bold(i == self.index, name.as_str()))?; - } - i += 1; - } - for (_, name) in self.files.iter() { - if i >= self.scroll { - add(&Tui::bold(i == self.index, name.as_str()))?; - } - i += 1; - } - add(&format!("{}/{i}", self.index))?; - Ok(()) -}));*/ - diff --git a/output/src/space/measure.rs b/output/src/space/measure.rs index a894b60..9ea4765 100644 --- a/output/src/space/measure.rs +++ b/output/src/space/measure.rs @@ -7,7 +7,7 @@ pub trait HasSize { self.size().w() } fn height (&self) -> usize { - self.size().h() + self.size().w() } } diff --git a/output/src/view.rs b/output/src/view.rs index 484194d..f2e9ef4 100644 --- a/output/src/view.rs +++ b/output/src/view.rs @@ -54,7 +54,7 @@ pub trait ViewContext<'state, E: Output + 'state>: Send + Sync match value { Value::Sym(_) => self.get_content_sym(value), Value::Exp(_, _) => self.get_content_exp(value), - _ => panic!("only :symbols and (expressions) accepted here, got: {value:?}") + _ => panic!("only :symbols and (expressions) accepted here") } } fn get_content_sym <'source: 'state> (&'state self, value: &Value<'source>) diff --git a/tui/src/tui_content/tui_field.rs b/tui/src/tui_content/tui_field.rs index fa3f123..7c83950 100644 --- a/tui/src/tui_content/tui_field.rs +++ b/tui/src/tui_content/tui_field.rs @@ -17,13 +17,10 @@ pub struct FieldV(pub ItemTheme, pub T, pub U); impl, U: Content> Content for FieldV { fn content (&self) -> impl Render { let Self(ItemTheme { darkest, dark, lighter, lightest, .. }, title, value) = self; - let sep1 = Tui::bg(darkest.rgb, Tui::fg(dark.rgb, "▐")); - let sep2 = Tui::bg(darkest.rgb, Tui::fg(dark.rgb, "▌")); - let title = Tui::bg(dark.rgb, Tui::fg(lighter.rgb, Tui::bold(true, title))); + let sep1 = Tui::bg(darkest.rgb, Tui::fg(dark.rgb, "▐")); + let sep2 = Tui::bg(darkest.rgb, Tui::fg(dark.rgb, "▌")); + let title = Tui::bg(dark.rgb, Tui::fg(lighter.rgb, Tui::bold(true, title))); let value = Tui::bg(darkest.rgb, Tui::fg(lightest.rgb, value)); - Bsp::n( - Align::w(value), - Fill::x(Align::w(row!(sep1, title, sep2))) - ) + Bsp::e(Bsp::s(row!(sep1, title, sep2), value), " ") } }