From 1867bb6aa35408461ab699b56267a249432f6d91 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Thu, 28 Mar 2019 03:07:43 +0200 Subject: [PATCH] ui: hide divider column in VSplit if !self.show_divider --- src/bin.rs | 2 +- ui/src/components/mail.rs | 3 --- ui/src/components/utilities.rs | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/bin.rs b/src/bin.rs index 5eac3995..f5c02e7d 100644 --- a/src/bin.rs +++ b/src/bin.rs @@ -67,7 +67,7 @@ fn main() { let listing = listing::Listing::from(IndexStyle::Compact); let b = Entity::from(Box::new(listing)); let tabs = Box::new(Tabbed::new(vec![ - Box::new(VSplit::new(menu, b, 90, true)), + Box::new(VSplit::new(menu, b, 90, false)), Box::new(AccountsPanel::new(&state.context)), Box::new(ContactList::default()), ])); diff --git a/ui/src/components/mail.rs b/ui/src/components/mail.rs index 557de7cd..4a760fd7 100644 --- a/ui/src/components/mail.rs +++ b/ui/src/components/mail.rs @@ -253,9 +253,6 @@ impl Component for AccountMenu { self.dirty = false; let mut y = get_y(upper_left); for a in &self.accounts { - for x in x..=x_max { - grid[(x, y)].set_ch('━'); - } y += 1; y += self.print_account(grid, (set_y(upper_left, y), bottom_right), &a, context); } diff --git a/ui/src/components/utilities.rs b/ui/src/components/utilities.rs index 27626ff8..9d126ecd 100644 --- a/ui/src/components/utilities.rs +++ b/ui/src/components/utilities.rs @@ -200,7 +200,7 @@ impl Component for VSplit { } else { self.left.component.draw( grid, - (upper_left, ((mid - 1), get_y(bottom_right))), + (upper_left, (if self.show_divider { mid - 1 } else { mid }, get_y(bottom_right))), context, ); self.right