mimetree-rebase: FocusText -> ANSIText (See pazz#1015)

ryneeverett · Mar 23, 2020 · aaff899 · aaff899
1 parent 514b82f
commit aaff899
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/alot/commands/thread.py b/alot/commands/thread.py
@@ -590,7 +590,6 @@ def matches(msgt):
             mimetree = not mt.display_mimetree \
                 if self.mimetree == 'toggle' else self.mimetree
 
-
             # collapse/expand depending on new 'visible' value
             if visible is False:
                 mt.collapse(mt.root)

diff --git a/alot/widgets/thread.py b/alot/widgets/thread.py
@@ -16,6 +16,8 @@
 from ..db.utils import decode_header, X_SIGNATURE_MESSAGE_HEADER
 from ..helper import string_sanitize
 
+ANSI_BACKGROUND = settings.get("interpret_ansi_background")
+
 
 class MessageSummaryWidget(urwid.WidgetWrap):
     """
@@ -80,17 +82,16 @@ def __init__(self, content, attr=None, attr_focus=None):
         for each line in content.
         """
         structure = []
-        ansi_background = settings.get("interpret_ansi_background")
 
         # depending on this config setting, we either add individual lines
         # or the complete context as focusable objects.
         if settings.get('thread_focus_linewise'):
             for line in content.splitlines():
                 structure.append((ANSIText(line, attr, attr_focus,
-                                           ansi_background), None))
+                                           ANSI_BACKGROUND), None))
         else:
             structure.append((ANSIText(content, attr, attr_focus,
-                                       ansi_background), None))
+                                       ANSI_BACKGROUND), None))
         SimpleTree.__init__(self, structure)
 
 
@@ -334,7 +335,7 @@ def _text_tree_to_widget_tree(self, tree):
         att = settings.get_theming_attribute('thread', 'body')
         att_focus = settings.get_theming_attribute('thread', 'body_focus')
         label, subtrees = tree
-        label = FocusableText(label, att, att_focus)
+        label = ANSIText(label, att, att_focus, ANSI_BACKGROUND)
         if subtrees is None:
             return label, None
         else: