1 files changed, 2 insertions, 47 deletions
diff --git a/src/components/mail/listing/compact.rs b/src/components/mail/listing/compact.rs
index dc476586..1efe0ff5 100644
--- a/src/components/mail/listing/compact.rs
+++ b/src/components/mail/listing/compact.rs
@@ -252,25 +252,7 @@ impl MailListingTrait for CompactListing {
         self.cursor_pos.1 = self.new_cursor_pos.1;
         self.cursor_pos.0 = self.new_cursor_pos.0;
 
-        self.color_cache = ColorCache {
-            even_unseen: crate::conf::value(context, "mail.listing.compact.even_unseen"),
-            even_selected: crate::conf::value(context, "mail.listing.compact.even_selected"),
-            even_highlighted: crate::conf::value(context, "mail.listing.compact.even_highlighted"),
-            odd_unseen: crate::conf::value(context, "mail.listing.compact.odd_unseen"),
-            odd_selected: crate::conf::value(context, "mail.listing.compact.odd_selected"),
-            odd_highlighted: crate::conf::value(context, "mail.listing.compact.odd_highlighted"),
-            even: crate::conf::value(context, "mail.listing.compact.even"),
-            odd: crate::conf::value(context, "mail.listing.compact.odd"),
-            tag_default: crate::conf::value(context, "mail.listing.tag_default"),
-            theme_default: crate::conf::value(context, "theme_default"),
-            ..self.color_cache
-        };
-        if !context.settings.terminal.use_color() {
-            self.color_cache.highlighted.attrs |= Attr::REVERSE;
-            self.color_cache.tag_default.attrs |= Attr::REVERSE;
-            self.color_cache.even_highlighted.attrs |= Attr::REVERSE;
-            self.color_cache.odd_highlighted.attrs |= Attr::REVERSE;
-        }
+        self.color_cache = ColorCache::new(context, IndexStyle::Compact);
 
         // Get mailbox as a reference.
         //
@@ -1705,34 +1687,7 @@ impl Component for CompactListing {
         }
         match *event {
             UIEvent::ConfigReload { old_settings: _ } => {
-                self.color_cache = ColorCache {
-                    even_unseen: crate::conf::value(context, "mail.listing.compact.even_unseen"),
-                    even_selected: crate::conf::value(
-                        context,
-                        "mail.listing.compact.even_selected",
-                    ),
-                    even_highlighted: crate::conf::value(
-                        context,
-                        "mail.listing.compact.even_highlighted",
-                    ),
-                    odd_unseen: crate::conf::value(context, "mail.listing.compact.odd_unseen"),
-                    odd_selected: crate::conf::value(context, "mail.listing.compact.odd_selected"),
-                    odd_highlighted: crate::conf::value(
-                        context,
-                        "mail.listing.compact.odd_highlighted",
-                    ),
-                    even: crate::conf::value(context, "mail.listing.compact.even"),
-                    odd: crate::conf::value(context, "mail.listing.compact.odd"),
-                    tag_default: crate::conf::value(context, "mail.listing.tag_default"),
-                    theme_default: crate::conf::value(context, "theme_default"),
-                    ..self.color_cache
-                };
-                if !context.settings.terminal.use_color() {
-                    self.color_cache.highlighted.attrs |= Attr::REVERSE;
-                    self.color_cache.tag_default.attrs |= Attr::REVERSE;
-                    self.color_cache.even_highlighted.attrs |= Attr::REVERSE;
-                    self.color_cache.odd_highlighted.attrs |= Attr::REVERSE;
-                }
+                self.color_cache = ColorCache::new(context, IndexStyle::Compact);
                 self.refresh_mailbox(context, true);
                 self.set_dirty(true);
             }