diff --git a/ui/src/components/contacts/contact_list.rs b/ui/src/components/contacts/contact_list.rs
index 45966c6c..dd5e7946 100644
--- a/ui/src/components/contacts/contact_list.rs
+++ b/ui/src/components/contacts/contact_list.rs
@@ -52,7 +52,7 @@ impl ContactList {
content,
dirty: true,
view: None,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
diff --git a/ui/src/components/indexer.rs b/ui/src/components/indexer.rs
index 35981fc0..6a1bdf1f 100644
--- a/ui/src/components/indexer.rs
+++ b/ui/src/components/indexer.rs
@@ -54,7 +54,7 @@ impl Default for Indexer {
entries: Vec::with_capacity(8),
dirty: true,
cursor: Vec::with_capacity(8),
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
}
diff --git a/ui/src/components/mail.rs b/ui/src/components/mail.rs
index c51b0d18..61686290 100644
--- a/ui/src/components/mail.rs
+++ b/ui/src/components/mail.rs
@@ -73,7 +73,7 @@ impl AccountMenu {
visible: true,
dirty: true,
cursor: None,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
/*
diff --git a/ui/src/components/mail/accounts.rs b/ui/src/components/mail/accounts.rs
index 70fa4077..8c7a24d6 100644
--- a/ui/src/components/mail/accounts.rs
+++ b/ui/src/components/mail/accounts.rs
@@ -101,7 +101,7 @@ impl AccountsPanel {
cursor: 0,
content,
dirty: true,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
fn initialize(&mut self, context: &Context) {
diff --git a/ui/src/components/mail/compose.rs b/ui/src/components/mail/compose.rs
index e7c6583f..c0296844 100644
--- a/ui/src/components/mail/compose.rs
+++ b/ui/src/components/mail/compose.rs
@@ -63,7 +63,7 @@ impl Default for Composer {
mode: ViewMode::Edit,
dirty: true,
initialized: false,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
}
@@ -117,6 +117,7 @@ impl Composer {
pub fn new(account_cursor: usize) -> Self {
Composer {
account_cursor,
+ id: ComponentId::new_v4(),
..Default::default()
}
}
@@ -575,6 +576,9 @@ impl Component for Composer {
.stdout
),
));
+ context
+ .replies
+ .push_back(UIEvent::Action(Tab(Kill(self.id))));
return true;
}
UIEvent::Input(Key::Char('e')) if self.cursor == Cursor::Body => {
diff --git a/ui/src/components/mail/listing/compact.rs b/ui/src/components/mail/listing/compact.rs
index 7d7c833b..150a24e6 100644
--- a/ui/src/components/mail/listing/compact.rs
+++ b/ui/src/components/mail/listing/compact.rs
@@ -88,7 +88,7 @@ impl MailboxView {
view: ThreadView::default(),
movement: None,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
/// Fill the `self.content` `CellBuffer` with the contents of the account folder the user has
@@ -636,7 +636,7 @@ impl CompactListing {
cursor: 0,
dirty: true,
populated: false,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
}
diff --git a/ui/src/components/mail/listing/mailbox_view.rs b/ui/src/components/mail/listing/mailbox_view.rs
new file mode 100644
index 00000000..b355bc9c
--- /dev/null
+++ b/ui/src/components/mail/listing/mailbox_view.rs
@@ -0,0 +1,588 @@
+/*
+ * meli - ui crate.
+ *
+ * Copyright 2017-2019 Manos Pitsidianakis
+ *
+ * This file is part of meli.
+ *
+ * meli is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * meli is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with meli. If not, see .
+ */
+
+use super::*;
+use components::utilities::PageMovement;
+
+#[derive(Debug)]
+pub(mod) struct MailboxView {
+ /// (x, y, z): x is accounts, y is folders, z is index inside a folder.
+ cursor_pos: (usize, usize, usize),
+ new_cursor_pos: (usize, usize, usize),
+ length: usize,
+ sort: (SortField, SortOrder),
+ subsort: (SortField, SortOrder),
+ /// Cache current view.
+ content: CellBuffer,
+ /// If we must redraw on next redraw event
+ dirty: bool,
+ /// If `self.view` exists or not.
+ unfocused: bool,
+ view: ThreadView,
+
+ movement: Option,
+}
+
+impl fmt::Display for MailboxView {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ write!(f, "")
+ }
+}
+
+impl MailboxView {
+ /// Helper function to format entry strings for CompactListing */
+ /* TODO: Make this configurable */
+ fn make_entry_string(e: &Envelope, len: usize, idx: usize) -> String {
+ if len > 0 {
+ format!(
+ "{} {} {:.85} ({})",
+ idx,
+ &MailboxView::format_date(e),
+ e.subject(),
+ len
+ )
+ } else {
+ format!(
+ "{} {} {:.85}",
+ idx,
+ &MailboxView::format_date(e),
+ e.subject(),
+ )
+ }
+ }
+
+ fn new() -> Self {
+ let content = CellBuffer::new(0, 0, Cell::with_char(' '));
+ MailboxView {
+ cursor_pos: (0, 1, 0),
+ new_cursor_pos: (0, 0, 0),
+ length: 0,
+ sort: (Default::default(), Default::default()),
+ subsort: (SortField::Date, SortOrder::Desc),
+ content,
+ dirty: true,
+ unfocused: false,
+ view: ThreadView::default(),
+
+ movement: None,
+ }
+ }
+ /// Fill the `self.content` `CellBuffer` with the contents of the account folder the user has
+ /// chosen.
+ fn refresh_mailbox(&mut self, context: &mut Context) {
+ self.dirty = true;
+ let old_cursor_pos = self.cursor_pos;
+ if !(self.cursor_pos.0 == self.new_cursor_pos.0
+ && self.cursor_pos.1 == self.new_cursor_pos.1)
+ {
+ //TODO: store cursor_pos in each folder
+ self.cursor_pos.2 = 0;
+ self.new_cursor_pos.2 = 0;
+ }
+ self.cursor_pos.1 = self.new_cursor_pos.1;
+ self.cursor_pos.0 = self.new_cursor_pos.0;
+
+ // Inform State that we changed the current folder view.
+ context.replies.push_back(UIEvent {
+ id: 0,
+ event_type: UIEvent::RefreshMailbox((self.cursor_pos.0, self.cursor_pos.1)),
+ });
+ // Get mailbox as a reference.
+ //
+ match context.accounts[self.cursor_pos.0].status(self.cursor_pos.1) {
+ Ok(_) => {}
+ Err(_) => {
+ self.content = CellBuffer::new(MAX_COLS, 1, Cell::with_char(' '));
+ self.length = 0;
+ write_string_to_grid(
+ "Loading.",
+ &mut self.content,
+ Color::Default,
+ Color::Default,
+ ((0, 0), (MAX_COLS - 1, 0)),
+ false,
+ );
+ return;
+ }
+ }
+ if old_cursor_pos == self.new_cursor_pos {
+ self.view.update(context);
+ } else {
+ self.view = ThreadView::new(self.new_cursor_pos, None, context);
+ }
+
+ let mailbox = &context.accounts[self.cursor_pos.0][self.cursor_pos.1]
+ .as_ref()
+ .unwrap();
+
+ self.length = mailbox.collection.threads.root_len();
+ self.content = CellBuffer::new(MAX_COLS, self.length + 1, Cell::with_char(' '));
+ if self.length == 0 {
+ write_string_to_grid(
+ &format!("Folder `{}` is empty.", mailbox.folder.name()),
+ &mut self.content,
+ Color::Default,
+ Color::Default,
+ ((0, 0), (MAX_COLS - 1, 0)),
+ false,
+ );
+ return;
+ }
+ let threads = &mailbox.collection.threads;
+ threads.sort_by(self.sort, self.subsort, &mailbox.collection);
+ for (idx, root_idx) in threads.root_iter().enumerate() {
+ let thread_node = &threads.thread_nodes()[root_idx];
+ let i = if let Some(i) = thread_node.message() {
+ i
+ } else {
+ let mut iter_ptr = thread_node.children()[0];
+ while threads.thread_nodes()[iter_ptr].message().is_none() {
+ iter_ptr = threads.thread_nodes()[iter_ptr].children()[0];
+ }
+ threads.thread_nodes()[iter_ptr].message().unwrap()
+ };
+ if !mailbox.collection.contains_key(&i) {
+ if cfg!(feature = "debug_log") {
+ eprintln!("key = {}", i);
+ }
+ eprintln!(
+ "name = {} {}",
+ mailbox.name(),
+ context.accounts[self.cursor_pos.0].name()
+ );
+ if cfg!(feature = "debug_log") {
+ eprintln!("{:#?}", context.accounts);
+ }
+
+ panic!();
+ }
+ let root_envelope: &Envelope = &mailbox.collection[&i];
+ let fg_color = if thread_node.has_unseen() {
+ Color::Byte(0)
+ } else {
+ Color::Default
+ };
+ let bg_color = if thread_node.has_unseen() {
+ Color::Byte(251)
+ } else if idx % 2 == 0 {
+ Color::Byte(236)
+ } else {
+ Color::Default
+ };
+ let (x, _) = write_string_to_grid(
+ &MailboxView::make_entry_string(root_envelope, thread_node.len(), idx),
+ &mut self.content,
+ fg_color,
+ bg_color,
+ ((0, idx), (MAX_COLS - 1, idx)),
+ false,
+ );
+
+ for x in x..MAX_COLS {
+ self.content[(x, idx)].set_ch(' ');
+ self.content[(x, idx)].set_bg(bg_color);
+ }
+ }
+ }
+
+ fn highlight_line(&self, grid: &mut CellBuffer, area: Area, idx: usize, context: &Context) {
+ if idx == self.cursor_pos.2 {
+ let mailbox = &context.accounts[self.cursor_pos.0][self.cursor_pos.1]
+ .as_ref()
+ .unwrap();
+ if mailbox.is_empty() {
+ return;
+ }
+ let threads = &mailbox.collection.threads;
+ let thread_node = threads.root_set(idx);
+ let thread_node = &threads.thread_nodes()[thread_node];
+ let i = if let Some(i) = thread_node.message() {
+ i
+ } else {
+ let mut iter_ptr = thread_node.children()[0];
+ while threads.thread_nodes()[iter_ptr].message().is_none() {
+ iter_ptr = threads.thread_nodes()[iter_ptr].children()[0];
+ }
+ threads.thread_nodes()[iter_ptr].message().unwrap()
+ };
+
+ let root_envelope: &Envelope = &mailbox.collection[&i];
+ let fg_color = if !root_envelope.is_seen() {
+ Color::Byte(0)
+ } else {
+ Color::Default
+ };
+ let bg_color = if self.cursor_pos.2 == idx {
+ Color::Byte(246)
+ } else if !root_envelope.is_seen() {
+ Color::Byte(251)
+ } else if idx % 2 == 0 {
+ Color::Byte(236)
+ } else {
+ Color::Default
+ };
+ change_colors(grid, area, fg_color, bg_color);
+ return;
+ }
+
+ let (width, height) = self.content.size();
+ copy_area(
+ grid,
+ &self.content,
+ area,
+ ((0, idx), (width - 1, height - 1)),
+ );
+ }
+
+ /// Draw the list of `Envelope`s.
+ fn draw_list(&mut self, grid: &mut CellBuffer, area: Area, context: &mut Context) {
+ if self.cursor_pos.1 != self.new_cursor_pos.1 || self.cursor_pos.0 != self.new_cursor_pos.0
+ {
+ self.refresh_mailbox(context);
+ }
+ let upper_left = upper_left!(area);
+ let bottom_right = bottom_right!(area);
+ if self.length == 0 {
+ clear_area(grid, area);
+ copy_area(
+ grid,
+ &self.content,
+ area,
+ ((0, 0), (MAX_COLS - 1, self.length)),
+ );
+ context.dirty_areas.push_back(area);
+ return;
+ }
+ let rows = get_y(bottom_right) - get_y(upper_left) + 1;
+
+ if let Some(mvm) = self.movement.take() {
+ match mvm {
+ PageMovement::PageUp => {
+ self.new_cursor_pos.2 = self.new_cursor_pos.2.saturating_sub(rows);
+ }
+ PageMovement::PageDown => {
+ /* This might "overflow" beyond the max_cursor_pos boundary if it's not yet
+ * set. TODO: Rework the page up/down stuff
+ */
+ if self.new_cursor_pos.2 + 2 * rows + 1 < self.length {
+ self.new_cursor_pos.2 += rows;
+ } else {
+ self.new_cursor_pos.2 = self.length.saturating_sub(rows).saturating_sub(1);
+ }
+ }
+ }
+ }
+
+ let prev_page_no = (self.cursor_pos.2).wrapping_div(rows);
+ let page_no = (self.new_cursor_pos.2).wrapping_div(rows);
+
+ let top_idx = page_no * rows;
+
+ /* If cursor position has changed, remove the highlight from the previous position and
+ * apply it in the new one. */
+ if self.cursor_pos.2 != self.new_cursor_pos.2 && prev_page_no == page_no {
+ let old_cursor_pos = self.cursor_pos;
+ self.cursor_pos = self.new_cursor_pos;
+ for idx in &[old_cursor_pos.2, self.new_cursor_pos.2] {
+ if *idx >= self.length {
+ continue; //bounds check
+ }
+ let new_area = (
+ set_y(upper_left, get_y(upper_left) + (*idx % rows)),
+ set_y(bottom_right, get_y(upper_left) + (*idx % rows)),
+ );
+ self.highlight_line(grid, new_area, *idx, context);
+ context.dirty_areas.push_back(new_area);
+ }
+ return;
+ } else if self.cursor_pos != self.new_cursor_pos {
+ self.cursor_pos = self.new_cursor_pos;
+ }
+ if self.new_cursor_pos.2 >= self.length {
+ self.new_cursor_pos.2 = self.length - 1;
+ self.cursor_pos.2 = self.new_cursor_pos.2;
+ }
+
+ /* Page_no has changed, so draw new page */
+ copy_area(
+ grid,
+ &self.content,
+ area,
+ ((0, top_idx), (MAX_COLS - 1, self.length)),
+ );
+ self.highlight_line(
+ grid,
+ (
+ set_y(upper_left, get_y(upper_left) + (self.cursor_pos.2 % rows)),
+ set_y(bottom_right, get_y(upper_left) + (self.cursor_pos.2 % rows)),
+ ),
+ self.cursor_pos.2,
+ context,
+ );
+ context.dirty_areas.push_back(area);
+ }
+
+ fn format_date(envelope: &Envelope) -> String {
+ let d = std::time::UNIX_EPOCH + std::time::Duration::from_secs(envelope.date());
+ let now: std::time::Duration = std::time::SystemTime::now()
+ .duration_since(d)
+ .unwrap_or_else(|_| std::time::Duration::new(std::u64::MAX, 0));
+ match now.as_secs() {
+ n if n < 10 * 60 * 60 => format!("{} hours ago{}", n / (60 * 60), " ".repeat(8)),
+ n if n < 24 * 60 * 60 => format!("{} hours ago{}", n / (60 * 60), " ".repeat(7)),
+ n if n < 4 * 24 * 60 * 60 => {
+ format!("{} days ago{}", n / (24 * 60 * 60), " ".repeat(9))
+ }
+ _ => envelope.datetime().format("%Y-%m-%d %H:%M:%S").to_string(),
+ }
+ }
+}
+
+impl Component for MailboxView {
+ fn draw(&mut self, grid: &mut CellBuffer, area: Area, context: &mut Context) {
+ if !self.unfocused {
+ if !self.is_dirty() {
+ return;
+ }
+ /* Draw the entire list */
+ self.draw_list(grid, area, context);
+ } else {
+ if self.length == 0 && self.dirty {
+ clear_area(grid, area);
+ context.dirty_areas.push_back(area);
+ return;
+ }
+
+ self.view.draw(grid, area, context);
+ }
+ self.dirty = false;
+ }
+ fn process_event(&mut self, event: &mut UIEvent, context: &mut Context) -> bool {
+ if self.unfocused && self.view.process_event(event, context) {
+ return true;
+ }
+
+ let shortcuts = self.get_shortcuts(context);
+ match *event {
+ UIEvent::Input(Key::Up) => {
+ if self.cursor_pos.2 > 0 {
+ self.new_cursor_pos.2 = self.new_cursor_pos.2.saturating_sub(1);
+ self.dirty = true;
+ }
+ return true;
+ }
+ UIEvent::Input(Key::Down) => {
+ if self.length > 0 && self.new_cursor_pos.2 < self.length - 1 {
+ self.new_cursor_pos.2 += 1;
+ self.dirty = true;
+ }
+ return true;
+ }
+ UIEvent::Input(ref k) if !self.unfocused && *k == shortcuts["open_thread"] => {
+ self.view = ThreadView::new(self.cursor_pos, None, context);
+ self.unfocused = true;
+ self.dirty = true;
+ return true;
+ }
+ UIEvent::Input(ref key) if *key == shortcuts["prev_page"] => {
+ self.movement = Some(PageMovement::PageUp);
+ self.set_dirty();
+ }
+ UIEvent::Input(ref key) if *key == shortcuts["next_page"] => {
+ self.movement = Some(PageMovement::PageDown);
+ self.set_dirty();
+ }
+ UIEvent::Input(ref k) if self.unfocused && *k == shortcuts["exit_thread"] => {
+ self.unfocused = false;
+ self.dirty = true;
+ return true;
+ }
+ UIEvent::Input(Key::Char(k @ 'J')) | UIEvent::Input(Key::Char(k @ 'K')) => {
+ let folder_length = context.accounts[self.cursor_pos.0].len();
+ let accounts_length = context.accounts.len();
+ match k {
+ 'J' if folder_length > 0 && self.new_cursor_pos.1 < folder_length - 1 => {
+ self.new_cursor_pos.1 = self.cursor_pos.1 + 1;
+ self.refresh_mailbox(context);
+ }
+ 'K' if self.cursor_pos.1 > 0 => {
+ self.new_cursor_pos.1 = self.cursor_pos.1 - 1;
+ self.refresh_mailbox(context);
+ }
+ _ => return false,
+ }
+ return true;
+ }
+ UIEvent::RefreshMailbox(_) => {
+ self.dirty = true;
+ }
+ UIEvent::MailboxUpdate((ref idxa, ref idxf))
+ if *idxa == self.new_cursor_pos.0 && *idxf == self.new_cursor_pos.1 =>
+ {
+ self.refresh_mailbox(context);
+ self.set_dirty();
+ }
+ UIEvent::StartupCheck(ref f)
+ if context.mailbox_hashes[f] == (self.new_cursor_pos.0, self.new_cursor_pos.1) =>
+ {
+ self.refresh_mailbox(context);
+ self.set_dirty();
+ }
+ UIEvent::ChangeMode(UIMode::Normal) => {
+ self.dirty = true;
+ }
+ UIEvent::Resize => {
+ self.dirty = true;
+ }
+ UIEvent::Action(ref action) => match action {
+ Action::ViewMailbox(idx) => {
+ self.new_cursor_pos.1 = *idx;
+ self.refresh_mailbox(context);
+ return true;
+ }
+ Action::SubSort(field, order) => {
+ if cfg!(feature = "debug_log") {
+ eprintln!("SubSort {:?} , {:?}", field, order);
+ }
+ self.subsort = (*field, *order);
+ self.refresh_mailbox(context);
+ return true;
+ }
+ Action::Sort(field, order) => {
+ if cfg!(feature = "debug_log") {
+ eprintln!("Sort {:?} , {:?}", field, order);
+ }
+ self.sort = (*field, *order);
+ self.refresh_mailbox(context);
+ return true;
+ }
+ _ => {}
+ },
+ UIEvent::Input(Key::Char('m')) if !self.unfocused => {
+ context.replies.push_back(UIEvent {
+ id: 0,
+ event_type: UIEvent::Action(Tab(NewDraft(self.cursor_pos.0))),
+ });
+ return true;
+ }
+ _ => {}
+ }
+ false
+ }
+ fn is_dirty(&self) -> bool {
+ self.dirty
+ || if self.unfocused {
+ self.view.is_dirty()
+ } else {
+ false
+ }
+ }
+ fn set_dirty(&mut self) {
+ if self.unfocused {
+ self.view.set_dirty();
+ }
+ self.dirty = true;
+ }
+
+ fn get_shortcuts(&self, context: &Context) -> ShortcutMap {
+ let mut map = if self.unfocused {
+ self.view.get_shortcuts(context)
+ } else {
+ ShortcutMap::default()
+ };
+
+ let config_map = context.settings.shortcuts.compact_listing.key_values();
+ map.insert(
+ "open_thread",
+ if let Some(key) = config_map.get("open_thread") {
+ (*key).clone()
+ } else {
+ Key::Char('\n')
+ },
+ );
+ map.insert(
+ "prev_page",
+ if let Some(key) = config_map.get("prev_page") {
+ (*key).clone()
+ } else {
+ Key::PageUp
+ },
+ );
+ map.insert(
+ "next_page",
+ if let Some(key) = config_map.get("next_page") {
+ (*key).clone()
+ } else {
+ Key::PageDown
+ },
+ );
+ map.insert(
+ "exit_thread",
+ if let Some(key) = config_map.get("exit_thread") {
+ (*key).clone()
+ } else {
+ Key::Char('i')
+ },
+ );
+ map.insert(
+ "prev_folder",
+ if let Some(key) = config_map.get("prev_folder") {
+ (*key).clone()
+ } else {
+ Key::Char('J')
+ },
+ );
+ map.insert(
+ "next_folder",
+ if let Some(key) = config_map.get("next_folder") {
+ (*key).clone()
+ } else {
+ Key::Char('K')
+ },
+ );
+ map.insert(
+ "prev_account",
+ if let Some(key) = config_map.get("prev_account") {
+ (*key).clone()
+ } else {
+ Key::Char('h')
+ },
+ );
+ map.insert(
+ "next_account",
+ if let Some(key) = config_map.get("next_account") {
+ (*key).clone()
+ } else {
+ Key::Char('l')
+ },
+ );
+ map.insert(
+ "new_mail",
+ if let Some(key) = config_map.get("new_mail") {
+ (*key).clone()
+ } else {
+ Key::Char('m')
+ },
+ );
+
+ map
+ }
+}
diff --git a/ui/src/components/mail/listing/plain.rs b/ui/src/components/mail/listing/plain.rs
index 4ea9713b..c1091850 100644
--- a/ui/src/components/mail/listing/plain.rs
+++ b/ui/src/components/mail/listing/plain.rs
@@ -90,7 +90,7 @@ impl PlainListing {
dirty: true,
unfocused: false,
view: None,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
/// Fill the `self.content` `CellBuffer` with the contents of the account folder the user has
diff --git a/ui/src/components/mail/listing/thread.rs b/ui/src/components/mail/listing/thread.rs
index 93fbb635..cdf5cb6e 100644
--- a/ui/src/components/mail/listing/thread.rs
+++ b/ui/src/components/mail/listing/thread.rs
@@ -87,7 +87,7 @@ impl ThreadListing {
unfocused: false,
view: None,
initialised: false,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
/// Fill the `self.content` `CellBuffer` with the contents of the account folder the user has
diff --git a/ui/src/components/mail/view.rs b/ui/src/components/mail/view.rs
index d0327ae2..fdc5a2e8 100644
--- a/ui/src/components/mail/view.rs
+++ b/ui/src/components/mail/view.rs
@@ -113,7 +113,7 @@ impl MailView {
mode: ViewMode::Normal,
cmd_buf: String::with_capacity(4),
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
diff --git a/ui/src/components/mail/view/envelope.rs b/ui/src/components/mail/view/envelope.rs
index 4d391d74..4e62f72b 100644
--- a/ui/src/components/mail/view/envelope.rs
+++ b/ui/src/components/mail/view/envelope.rs
@@ -80,7 +80,7 @@ impl EnvelopeView {
wrapper,
account_pos,
cmd_buf: String::with_capacity(4),
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
diff --git a/ui/src/components/mail/view/html.rs b/ui/src/components/mail/view/html.rs
index c711df5b..c6f29bf5 100644
--- a/ui/src/components/mail/view/html.rs
+++ b/ui/src/components/mail/view/html.rs
@@ -32,7 +32,7 @@ pub struct HtmlView {
impl HtmlView {
pub fn new(bytes: Vec, context: &mut Context, account_pos: usize) -> Self {
- let id = ComponentId::default();
+ let id = ComponentId::new_v4();
let settings = context.accounts[account_pos].runtime_settings.conf();
if let Some(filter_invocation) = settings.html_filter() {
let parts = split_command!(filter_invocation);
diff --git a/ui/src/components/mail/view/thread.rs b/ui/src/components/mail/view/thread.rs
index 21376337..280845b1 100644
--- a/ui/src/components/mail/view/thread.rs
+++ b/ui/src/components/mail/view/thread.rs
@@ -133,7 +133,7 @@ impl ThreadView {
cursor_pos: 1,
new_cursor_pos: 0,
dirty: true,
- ..Default::default()
+ id: ComponentId::new_v4(), ..Default::default()
};
view.initiate(expanded_idx, context);
view.new_cursor_pos = view.new_expanded_pos;
diff --git a/ui/src/components/utilities.rs b/ui/src/components/utilities.rs
index bbf70ef0..7ba1b1aa 100644
--- a/ui/src/components/utilities.rs
+++ b/ui/src/components/utilities.rs
@@ -56,7 +56,7 @@ impl HSplit {
bottom,
show_divider,
ratio,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
}
@@ -154,7 +154,7 @@ impl VSplit {
show_divider,
prev_visibility: (true, true),
ratio,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
}
@@ -369,6 +369,7 @@ impl Pager {
width: content.size().0,
dirty: true,
content,
+ id: ComponentId::new_v4(),
..Default::default()
}
}
@@ -391,6 +392,7 @@ impl Pager {
width,
dirty: true,
content,
+ id: ComponentId::new_v4(),
..Default::default()
}
}
@@ -403,6 +405,7 @@ impl Pager {
width,
dirty: true,
content,
+ id: ComponentId::new_v4(),
..Default::default()
}
}
@@ -593,7 +596,7 @@ impl StatusBar {
dirty: true,
mode: UIMode::Normal,
height: 1,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
fn draw_status_bar(&mut self, grid: &mut CellBuffer, area: Area, context: &mut Context) {
@@ -796,7 +799,7 @@ impl Progress {
description: s,
total_work,
finished: 0,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
@@ -865,7 +868,7 @@ impl Tabbed {
cursor_pos: 0,
show_shortcuts: false,
dirty: true,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
fn draw_tabs(&mut self, grid: &mut CellBuffer, area: Area, context: &mut Context) {
@@ -1212,7 +1215,7 @@ impl Selector {
content,
cursor: 0,
dirty: true,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
diff --git a/ui/src/components/utilities/widgets.rs b/ui/src/components/utilities/widgets.rs
index 371b7965..71894171 100644
--- a/ui/src/components/utilities/widgets.rs
+++ b/ui/src/components/utilities/widgets.rs
@@ -226,7 +226,7 @@ impl FormWidget {
buttons: ButtonWidget::new((action, true)),
focus: FormFocus::Fields,
hide_buttons: false,
- ..Default::default()
+ id: ComponentId::new_v4(), ..Default::default()
}
}
@@ -486,7 +486,7 @@ where
buttons: vec![init_val].into_iter().collect(),
result: None,
cursor: 0,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
}
}
@@ -632,7 +632,7 @@ impl AutoComplete {
content: CellBuffer::default(),
cursor: 0,
dirty: true,
- id: ComponentId::default(),
+ id: ComponentId::new_v4(),
};
ret.set_suggestions(entries);
ret