diff options
-rw-r--r-- | alot/buffers.py | 24 | ||||
-rw-r--r-- | alot/widgets.py | 2 |
2 files changed, 19 insertions, 7 deletions
diff --git a/alot/buffers.py b/alot/buffers.py index 07a7589d..e2c17e01 100644 --- a/alot/buffers.py +++ b/alot/buffers.py @@ -78,11 +78,11 @@ class BufferlistBuffer(Buffer): line = widgets.BufferlineWidget(b) if (num % 2) == 0: attr = settings.get_theming_attribute('bufferlist', - 'results_even') + 'line_even') else: - attr = settings.get_theming_attribute('bufferlist', - 'results_odd') - focus_att = settings.get_theming_attribute('bufferlist', 'focus') + attr = settings.get_theming_attribute('bufferlist', 'line_odd') + focus_att = settings.get_theming_attribute('bufferlist', + 'line_focus') buf = urwid.AttrMap(line, attr, focus_att) num = urwid.Text('%3d:' % self.index_of(b)) lines.append(urwid.Columns([('fixed', 4, num), buf])) @@ -385,13 +385,25 @@ class TagListBuffer(Buffer): displayedtags = sorted(filter(self.filtfun, self.tags), key=unicode.lower) for (num, b) in enumerate(displayedtags): + line = widgets.BufferlineWidget(b) + if (num % 2) == 0: + attr = settings.get_theming_attribute('bufferlist', + 'results_even') + else: + attr = settings.get_theming_attribute('bufferlist', + 'results_odd') + focus_att = settings.get_theming_attribute('bufferlist', 'focus') + tw = widgets.TagWidget(b) rows = [('fixed', tw.width(), tw)] if tw.hidden: rows.append(urwid.Text('[hidden]')) elif tw.translated is not b: rows.append(urwid.Text('(%s)' % b)) - lines.append(urwid.Columns(rows, dividechars=1)) + line = urwid.Columns(rows, dividechars=1) + line = urwid.AttrMap(line, attr, focus_att) + lines.append(line) + self.taglist = urwid.ListBox(urwid.SimpleListWalker(lines)) self.body = self.taglist @@ -400,5 +412,5 @@ class TagListBuffer(Buffer): def get_selected_tag(self): """returns selected tagstring""" (cols, pos) = self.taglist.get_focus() - tagwidget = cols.get_focus() + tagwidget = cols.original_widget.get_focus() return tagwidget.get_tag() diff --git a/alot/widgets.py b/alot/widgets.py index a939464b..6de59622 100644 --- a/alot/widgets.py +++ b/alot/widgets.py @@ -299,7 +299,7 @@ class TagWidget(urwid.AttrMap): normal_att = representation['normal'] focus_att = representation['focussed'] self.attmaps = {'normal': normal_att, 'focus': focus_att} - urwid.AttrMap.__init__(self, self.txt, normal_att) + urwid.AttrMap.__init__(self, self.txt, normal_att, focus_att) def set_map(self, attrstring): self.set_attr_map({None: self.attmaps[attrstring]}) |