meli
/
meli
8
Fork 13
Code Issues 10 Pull Requests 10 Actions Packages Projects 1 Releases 18 Wiki Activity

ui: add contact selectors to every relevant field 

concerns #38
embed
Manos Pitsidianakis 2019-03-25 17:07:00 +02:00
parent e5856bd01e
commit d5c1da4a20
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/src/components/mail/compose.rs
View File

@ -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;

3
ui/src/components/mail/view/thread.rs
View File

@ -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;

2
ui/src/components/utilities.rs
View File

@ -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(