From 0bea143812f11a59f4957e6d4ebadcb59bfbf271 Mon Sep 17 00:00:00 2001
From: rr- <rr-@sakuya.pl>
Date: Mon, 5 Nov 2018 19:35:18 +0100
Subject: [PATCH] ui: group progress bars

---
 pqcli/ui/double_line_box.py | 41 +++++++++++++++++++++++++++++++++++++
 pqcli/ui/game_view.py       | 41 +++++++++++++++++--------------------
 2 files changed, 60 insertions(+), 22 deletions(-)
 create mode 100644 pqcli/ui/double_line_box.py

diff --git a/pqcli/ui/double_line_box.py b/pqcli/ui/double_line_box.py
new file mode 100644
index 0000000..67ca485
--- /dev/null
+++ b/pqcli/ui/double_line_box.py
@@ -0,0 +1,41 @@
+import typing as T
+
+import urwid
+
+
+class DoubleLineBox(urwid.AttrWrap):
+    def __init__(
+        self,
+        top_widget: urwid.Widget,
+        bottom_widget: urwid.Widget,
+        top_title: str = "",
+        bottom_title: str = "",
+    ) -> None:
+        super().__init__(
+            urwid.Pile(
+                [
+                    urwid.LineBox(
+                        urwid.AttrWrap(
+                            top_widget, "linebox-content", "linebox-content"
+                        ),
+                        title=top_title,
+                        bline="",
+                    ),
+                    (
+                        "pack",
+                        urwid.LineBox(
+                            urwid.AttrWrap(
+                                bottom_widget,
+                                "linebox-content",
+                                "linebox-content",
+                            ),
+                            title=bottom_title,
+                            tlcorner="├",
+                            trcorner="┤",
+                        ),
+                    ),
+                ]
+            ),
+            "linebox",
+            "linebox-focus",
+        )
diff --git a/pqcli/ui/game_view.py b/pqcli/ui/game_view.py
index b562833..f56cbc5 100644
--- a/pqcli/ui/game_view.py
+++ b/pqcli/ui/game_view.py
@@ -16,10 +16,11 @@ from pqcli.mechanic import (
 )
 from pqcli.ui.custom_line_box import CustomLineBox
 from pqcli.ui.custom_progress_bar import CustomProgressBar
+from pqcli.ui.double_line_box import DoubleLineBox
 from pqcli.ui.read_only_check_box import ReadOnlyCheckBox
 
 
-class CharacterSheetView(urwid.Pile):
+class CharacterSheetView(DoubleLineBox):
     def __init__(self, player: Player) -> None:
         self.player = player
 
@@ -51,11 +52,10 @@ class CharacterSheetView(urwid.Pile):
         self.sync()
 
         super().__init__(
-            [
-                CustomLineBox(self.list_box, title="Character Sheet"),
-                (1, urwid.Filler(urwid.Text("Experience"))),
-                (1, urwid.Filler(self.exp_bar)),
-            ]
+            top_widget=self.list_box,
+            bottom_widget=self.exp_bar,
+            top_title="Character Sheet",
+            bottom_title="Experience",
         )
 
     def sync(self) -> None:
@@ -141,7 +141,7 @@ class EquipmentView(CustomLineBox):
         self.value_texts[equipment_type].set_text(item_name or "")
 
 
-class InventoryView(urwid.Pile):
+class InventoryView(DoubleLineBox):
     def __init__(self, player: Player) -> None:
         self.player = player
 
@@ -161,11 +161,10 @@ class InventoryView(urwid.Pile):
         self.sync()
 
         super().__init__(
-            [
-                CustomLineBox(self.list_box, title="Inventory"),
-                (1, urwid.Filler(urwid.Text("Encumbrance"))),
-                (1, urwid.Filler(self.encumbrance_bar)),
-            ]
+            top_widget=self.list_box,
+            top_title="Inventory",
+            bottom_widget=self.encumbrance_bar,
+            bottom_title="Encumbrance",
         )
 
     def sync(self) -> None:
@@ -211,7 +210,7 @@ class InventoryView(urwid.Pile):
         return None
 
 
-class PlotView(urwid.Pile):
+class PlotView(DoubleLineBox):
     cutoff = 100
 
     def __init__(self, player: Player) -> None:
@@ -225,10 +224,9 @@ class PlotView(urwid.Pile):
         self.sync()
 
         super().__init__(
-            [
-                CustomLineBox(self.list_box, title="Plot Development"),
-                (1, urwid.Filler(self.plot_bar)),
-            ]
+            top_widget=self.list_box,
+            top_title="Plot Development",
+            bottom_widget=self.plot_bar,
         )
 
     def sync(self) -> None:
@@ -262,7 +260,7 @@ class PlotView(urwid.Pile):
         self.plot_bar.set_max(self.player.quest_book.plot_bar.max_)
 
 
-class QuestBookView(urwid.Pile):
+class QuestBookView(DoubleLineBox):
     cutoff = 100
 
     def __init__(self, player: Player) -> None:
@@ -276,10 +274,9 @@ class QuestBookView(urwid.Pile):
         self.sync()
 
         super().__init__(
-            [
-                CustomLineBox(self.list_box, title="Quests"),
-                (1, urwid.Filler(self.quest_bar)),
-            ]
+            top_widget=self.list_box,
+            top_title="Quests",
+            bottom_widget=self.quest_bar,
         )
 
     def sync(self) -> None: