diff options
| author | Manos Pitsidianakis <el13635@mail.ntua.gr> | 2019-03-25 17:07:00 +0200 |
|---|---|---|
| committer | Manos Pitsidianakis <el13635@mail.ntua.gr> | 2019-06-10 19:40:40 +0300 |
| commit | d5c1da4a208bdd106cf40103d61423e5a848d347 (patch) | |
| tree | 3ba151e2157031f70c34cfe490f3d36d6055a90c /ui | |
| parent | e5856bd01ea0272c6f6a3c2a351e476d52bd114d (diff) | |
ui: add contact selectors to every relevant field
concerns #38
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/src/components/mail/compose.rs | 8 | ||||
| -rw-r--r-- | ui/src/components/mail/view/thread.rs | 3 | ||||
| -rw-r--r-- | ui/src/components/utilities.rs | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/ui/src/components/mail/compose.rs b/ui/src/components/mail/compose.rs index d5c030ea..d7cc97ad 100644 --- a/ui/src/components/mail/compose.rs +++ b/ui/src/components/mail/compose.rs @@ -171,7 +171,7 @@ impl Composer { let headers = self.draft.headers(); let account_cursor = self.account_cursor; for &k in &["Date", "From", "To", "Cc", "Bcc", "Subject"] { - if k == "To" { + if k == "To" || k == "Cc" || k == "Bcc" { self.form.push_cl(( k.into(), headers[k].to_string(), @@ -281,7 +281,7 @@ impl Component for Composer { }; if width > 80 && self.reply_context.is_some() { - let area = (upper_left, set_x(bottom_right, (mid - 1))); + let area = (upper_left, set_x(bottom_right, mid - 1)); let view = &mut self.reply_context.as_mut().unwrap().1; view.set_dirty(); view.draw(grid, std::dbg!(area), context); @@ -297,7 +297,7 @@ impl Component for Composer { } else { ( pos_inc(upper_left, (mid + 1, header_height + 2)), - pos_dec(bottom_right, ((mid, 0))), + pos_dec(bottom_right, (mid, 0)), ) }; @@ -384,7 +384,7 @@ impl Component for Composer { return true; } } - (ViewMode::Overview, Some((_, ref mut view))) => { + (ViewMode::Overview, Some((_, ref mut _view))) => { //if view.process_event(event, context) { // self.dirty = true; // return true; diff --git a/ui/src/components/mail/view/thread.rs b/ui/src/components/mail/view/thread.rs index 0d167703..c56a63ea 100644 --- a/ui/src/components/mail/view/thread.rs +++ b/ui/src/components/mail/view/thread.rs @@ -571,6 +571,9 @@ impl Component for ThreadView { return true; } UIEventType::Input(Key::Char('\n')) => { + if self.entries.len() < 2 { + return true; + } self.new_expanded_pos = self.cursor_pos; self.show_mailview = true; self.initiated = false; diff --git a/ui/src/components/utilities.rs b/ui/src/components/utilities.rs index bc8c6b38..647110ad 100644 --- a/ui/src/components/utilities.rs +++ b/ui/src/components/utilities.rs @@ -1054,7 +1054,7 @@ impl Component for Selector { fn process_event(&mut self, event: &mut UIEvent, _context: &mut Context) -> bool { let (width, height) = self.content.size(); match event.event_type { - UIEventType::Input(Key::Char(' ')) => { + UIEventType::Input(Key::Char('\t')) => { self.entries[self.cursor].1 = !self.entries[self.cursor].1; if self.entries[self.cursor].1 { write_string_to_grid( |