From dacc4e4ba014e83ece89c0ff0d6ccadb3cb0e999 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Fri, 10 Aug 2018 11:26:42 +0300 Subject: [PATCH] Properly draw and exit subview in MailView when in attachment mode --- ui/src/components/mail/view/mod.rs | 7 +++---- ui/src/compose/mod.rs | 0 2 files changed, 3 insertions(+), 4 deletions(-) create mode 100644 ui/src/compose/mod.rs diff --git a/ui/src/components/mail/view/mod.rs b/ui/src/components/mail/view/mod.rs index 3cc3f2a6..17a290c5 100644 --- a/ui/src/components/mail/view/mod.rs +++ b/ui/src/components/mail/view/mod.rs @@ -313,10 +313,8 @@ impl Component for MailView { }; self.dirty = false; } - if self.mode == ViewMode::Subview { - if let Some(s) = self.subview.as_mut() { - s.draw(grid, (set_y(upper_left, y + 1), bottom_right), context); - } + if let Some(s) = self.subview.as_mut() { + s.draw(grid, (set_y(upper_left, y + 1), bottom_right), context); } else if let Some(p) = self.pager.as_mut() { p.draw(grid, (set_y(upper_left, y + 1), bottom_right), context); } @@ -342,6 +340,7 @@ impl Component for MailView { } UIEventType::Input(Key::Char('r')) if self.mode.is_attachment() => { self.mode = ViewMode::Normal; + self.subview.take(); self.dirty = true; } UIEventType::Input(Key::Char('a')) diff --git a/ui/src/compose/mod.rs b/ui/src/compose/mod.rs new file mode 100644 index 00000000..e69de29b