llange
/
meli
forked from meli/meli
1
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Properly draw and exit subview in MailView when in attachment mode

embed
Manos Pitsidianakis 2018-08-10 11:26:42 +03:00
parent 8462d1aceb
commit dacc4e4ba0
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/src/components/mail/view/mod.rs
View File

@ -313,10 +313,8 @@ impl Component for MailView {
}; };
self.dirty = false; self.dirty = false;
} }
if self.mode == ViewMode::Subview { if let Some(s) = self.subview.as_mut() {
if let Some(s) = self.subview.as_mut() { s.draw(grid, (set_y(upper_left, y + 1), bottom_right), context);
s.draw(grid, (set_y(upper_left, y + 1), bottom_right), context);
}
} else if let Some(p) = self.pager.as_mut() { } else if let Some(p) = self.pager.as_mut() {
p.draw(grid, (set_y(upper_left, y + 1), bottom_right), context); 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() => { UIEventType::Input(Key::Char('r')) if self.mode.is_attachment() => {
self.mode = ViewMode::Normal; self.mode = ViewMode::Normal;
self.subview.take();
self.dirty = true; self.dirty = true;
} }
UIEventType::Input(Key::Char('a')) UIEventType::Input(Key::Char('a'))

0
ui/src/compose/mod.rs 100644
View File