From 2349173a452d406f288c6f7f04c94a9753b1f494 Mon Sep 17 00:00:00 2001
From: Ivan Habunek <ivan@habunek.com>
Date: Sun, 25 Aug 2019 17:58:46 +0200
Subject: [PATCH] Tweaks

---
 toot/tui/app.py      |  5 +----
 toot/tui/timeline.py | 39 +++++++++++++++++++++++----------------
 toot/tui/widgets.py  |  2 --
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/toot/tui/app.py b/toot/tui/app.py
index 742c7a3..9b3b9d7 100644
--- a/toot/tui/app.py
+++ b/toot/tui/app.py
@@ -9,7 +9,6 @@ from toot import api
 from .constants import PALETTE
 from .entities import Status
 from .timeline import Timeline
-from .widgets import SelectableText
 
 logger = logging.getLogger(__name__)
 
@@ -194,9 +193,7 @@ class StatusSource(urwid.ListBox):
     def __init__(self, status):
         source = json.dumps(status.data, indent=4)
         lines = source.splitlines()
-        focus_map = {None: "blue_selected"}
         walker = urwid.SimpleFocusListWalker([
-            urwid.AttrMap(SelectableText(line), None, focus_map)
-            for line in lines
+            urwid.Text(line) for line in lines
         ])
         super().__init__(walker)
diff --git a/toot/tui/timeline.py b/toot/tui/timeline.py
index 16cb27a..e610af0 100644
--- a/toot/tui/timeline.py
+++ b/toot/tui/timeline.py
@@ -28,7 +28,7 @@ class Timeline(urwid.Columns):
         self.statuses = statuses
 
         self.status_list = self.build_status_list(statuses)
-        self.status_details = self.build_status_details(statuses[0])
+        self.status_details = StatusDetails(statuses[0])
 
         super().__init__([
             ("weight", 50, self.status_list),
@@ -51,10 +51,6 @@ class Timeline(urwid.Columns):
             None: "green_selected",
         })
 
-    def build_status_details(self, status):
-        details = StatusDetails(status)
-        return urwid.Filler(details, valign="top")
-
     def get_focused_status(self):
         return self.statuses[self.status_list.body.focus]
 
@@ -66,8 +62,8 @@ class Timeline(urwid.Columns):
     def status_focused(self):
         """Called when the list focus switches to a new status"""
         status = self.get_focused_status()
-        details = StatusDetails(status)
-        self.status_details.set_body(details)
+        self.status_details = StatusDetails(status)
+        self.contents[1] = self.status_details, ("weight", 50, False)
 
         index = self.status_list.body.focus
         count = len(self.statuses)
@@ -109,21 +105,30 @@ class StatusDetails(urwid.Pile):
     def content_generator(self, status):
         if status.data["reblog"]:
             boosted_by = status.data["account"]["display_name"]
-            yield urwid.Text(("gray", "♺ {} boosted".format(boosted_by)))
-            yield urwid.AttrMap(urwid.Divider("-"), "gray")
+            yield ("pack", urwid.Text(("gray", "♺ {} boosted".format(boosted_by))))
+            yield ("pack", urwid.AttrMap(urwid.Divider("-"), "gray"))
 
         if status.author.display_name:
-            yield urwid.Text(("green", status.author.display_name))
+            yield ("pack", urwid.Text(("green", status.author.display_name)))
 
-        yield urwid.Text(("yellow", status.author.account))
-        yield urwid.Divider()
+        yield ("pack", urwid.Text(("yellow", status.author.account)))
+        yield ("pack", urwid.Divider())
 
         for line in format_content(status.data["content"]):
-            yield urwid.Text(highlight_hashtags(line))
+            yield ("pack", urwid.Text(highlight_hashtags(line)))
 
         if status.data["card"]:
-            yield urwid.Divider()
-            yield self.build_card(status.data["card"])
+            yield ("pack", urwid.Divider())
+            yield ("pack", self.build_card(status.data["card"]))
+
+        # Push things to bottom
+        yield ("weight", 1, urwid.SolidFill(" "))
+        yield ("pack", urwid.Text([
+            ("cyan_bold", "B"), ("cyan", "oost"), " | ",
+            ("cyan_bold", "F"), ("cyan", "avourite"), " | ",
+            ("cyan_bold", "V"), ("cyan", "iew in browser"), " | ",
+            ("cyan_bold", "H"), ("cyan", "elp"), " ",
+        ]))
 
     def card_generator(self, card):
         yield urwid.Text(("green", card["title"].strip()))
@@ -137,7 +142,9 @@ class StatusDetails(urwid.Pile):
 
     def build_card(self, card):
         contents = list(self.card_generator(card))
-        return urwid.LineBox(urwid.Pile(contents))
+        card = urwid.Pile(contents)
+        card = urwid.Padding(card, left=1, right=1)
+        return urwid.LineBox(card)
 
 
 class StatusListItem(SelectableColumns):
diff --git a/toot/tui/widgets.py b/toot/tui/widgets.py
index 1db986b..52e254c 100644
--- a/toot/tui/widgets.py
+++ b/toot/tui/widgets.py
@@ -20,8 +20,6 @@ class Clickable:
         if button == 1:
             self._emit('click')
 
-        return super().mouse_event(size, event, button, x, y, focus)
-
 
 class SelectableText(Clickable, urwid.Text):
     _selectable = True