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

ui: handle ViewMailbox in listing.rs 

handling viewmailbox inside a listing instead of their parent/manager
component is a leftover from before they even had a parent/manager.
async
Manos Pitsidianakis 2020-02-08 23:44:17 +02:00
parent 647cb10b33
commit 22fb0c0844
Signed by: Manos Pitsidianakis
GPG Key ID: 73627C2F690DF710
5 changed files with 17 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/mail/listing.rs
View File

@ -639,6 +639,19 @@ impl Component for Listing {
self.component.set_dirty(true); self.component.set_dirty(true);
return true; return true;
} }
Action::ViewMailbox(idx) => {
if let Some((_, folder_hash)) =
self.accounts[self.cursor_pos.0].entries.get(*idx)
{
self.cursor_pos.1 = *idx;
self.component
.set_coordinates((self.cursor_pos.0, *folder_hash));
self.set_dirty(true);
} else {
return true;
}
return true;
}
_ => {} _ => {}
}, },
UIEvent::ChangeMode(UIMode::Normal) => { UIEvent::ChangeMode(UIMode::Normal) => {

13
src/components/mail/listing/compact.rs
View File

@ -1353,19 +1353,6 @@ impl Component for CompactListing {
return true; return true;
} }
UIEvent::Action(ref action) => match action { UIEvent::Action(ref action) => match action {
Action::ViewMailbox(idx) => {
if context.accounts[self.cursor_pos.0]
.folders_order
.get(*idx)
.is_none()
{
return true;
}
self.filtered_selection.clear();
self.new_cursor_pos.1 = *idx;
self.refresh_mailbox(context, false);
return true;
}
Action::Listing(Filter(ref filter_term)) if !self.unfocused => { Action::Listing(Filter(ref filter_term)) if !self.unfocused => {
self.filter(filter_term, context); self.filter(filter_term, context);
self.dirty = true; self.dirty = true;

13
src/components/mail/listing/conversations.rs
View File

@ -1290,19 +1290,6 @@ impl Component for ConversationsListing {
self.dirty = true; self.dirty = true;
} }
UIEvent::Action(ref action) => match action { UIEvent::Action(ref action) => match action {
Action::ViewMailbox(idx) => {
if context.accounts[self.cursor_pos.0]
.folders_order
.get(*idx)
.is_none()
{
return true;
}
self.set_coordinates((self.new_cursor_pos.0, *idx));
self.refresh_mailbox(context, false);
return true;
}
Action::Listing(Filter(ref filter_term)) if !self.unfocused => { Action::Listing(Filter(ref filter_term)) if !self.unfocused => {
self.filter(filter_term, context); self.filter(filter_term, context);
self.dirty = true; self.dirty = true;

24
src/components/mail/listing/plain.rs
View File

@ -1180,26 +1180,10 @@ impl Component for PlainListing {
self.refresh_mailbox(context, false); self.refresh_mailbox(context, false);
return true; return true;
} }
UIEvent::Action(ref action) => match action { UIEvent::Action(Action::Listing(Filter(ref filter_term))) if !self.unfocused => {
Action::ViewMailbox(idx) => { self.filter(filter_term, context);
if context.accounts[self.cursor_pos.0] self.dirty = true;
.folders_order }
.get(*idx)
.is_none()
{
return true;
}
self.filtered_selection.clear();
self.new_cursor_pos.1 = *idx;
self.refresh_mailbox(context, false);
return true;
}
Action::Listing(Filter(ref filter_term)) if !self.unfocused => {
self.filter(filter_term, context);
self.dirty = true;
}
_ => {}
},
_ => {} _ => {}
} }
false false

6
src/components/mail/listing/thread.rs
View File

@ -661,12 +661,6 @@ impl Component for ThreadListing {
self.dirty = true; self.dirty = true;
} }
UIEvent::Action(ref action) => match action { UIEvent::Action(ref action) => match action {
Action::ViewMailbox(idx_m) => {
self.new_cursor_pos.1 = *idx_m;
self.dirty = true;
self.refresh_mailbox(context, false);
return true;
}
Action::SubSort(field, order) => { Action::SubSort(field, order) => {
debug!("SubSort {:?} , {:?}", field, order); debug!("SubSort {:?} , {:?}", field, order);
self.subsort = (*field, *order); self.subsort = (*field, *order);