Merge pull request #242 from xnox/more-fixed-layout-fixes

Fix up more fixed layouts with button_pile().

subiquity/ui/views/filesystem/disk_partition.py

@@ -39,7 +39,7 @@ class DiskPartitionView(BaseView):
             Padding.line_break(""),
             Padding.center_79(self.show_disk_info_w()),
             Padding.line_break(""),
-            Padding.fixed_10(self._build_buttons()),
+            self._build_buttons(),
         ]
         super().__init__(ListBox(self.body))
 

subiquity/ui/views/filesystem/guided.py

@@ -77,7 +77,7 @@ class GuidedDiskSelectionView(BaseView):
             Padding.center_70(Text("")),
             Padding.center_70(Pile(disks)),
             Padding.center_70(Text("")),
-            Padding.fixed_10(cancel),
+            button_pile([cancel]),
             ])
         super().__init__(lb)
 

subiquity/ui/views/installpath.py

@@ -23,7 +23,7 @@ from urwid import BoxAdapter
 
 from subiquitycore.ui.lists import SimpleList
 from subiquitycore.ui.buttons import back_btn, menu_btn
-from subiquitycore.ui.utils import Padding
+from subiquitycore.ui.utils import Padding, button_pile
 from subiquitycore.ui.container import ListBox, Pile
 from subiquitycore.view import BaseView
 
@@ -38,7 +38,7 @@ class InstallpathView(BaseView):
         self.body = [
             Padding.center_79(self._build_model_inputs()),
             Padding.line_break(""),
-            Padding.fixed_10(self._build_buttons()),
+            self._build_buttons(),
         ]
         super().__init__(ListBox(self.body))
 
@@ -46,7 +46,7 @@ class InstallpathView(BaseView):
         self.buttons = [
             back_btn(on_press=self.cancel),
         ]
-        return Pile(self.buttons)
+        return button_pile(self.buttons)
 
     def _build_model_inputs(self):
         sl = []

subiquitycore/ui/interactive.py

@@ -33,7 +33,7 @@ from urwid import (
 from subiquitycore.ui.buttons import close_btn
 from subiquitycore.ui.container import Pile
 from subiquitycore.ui.selector import Selector
-from subiquitycore.ui.utils import Color, Padding
+from subiquitycore.ui.utils import Color, Padding, button_pile
 
 log = logging.getLogger("subiquitycore.ui.input")
 
@@ -118,8 +118,8 @@ class YesNo(Selector):
 class _HelpDisplay(WidgetWrap):
     def __init__(self, closer, help_text):
         self._closer = closer
-        button = close_btn(on_press=lambda btn:self._closer())
-        super().__init__(LineBox(Pile([Text(help_text), Padding.fixed_10(button)]), title=_("Help")))
+        buttons = [close_btn(on_press=lambda btn:self._closer())]
+        super().__init__(LineBox(Pile([Text(help_text), button_pile(buttons)]), title=_("Help")))
 
 
 class Help(WidgetWrap):

subiquitycore/ui/views/network.py

@@ -47,7 +47,7 @@ class ApplyingConfigWidget(WidgetWrap):
                         complete='progress_complete',
                         current=0, done=step_count)
         box = LineBox(Pile([self.bar,
-                            Padding.fixed_10(button)]),
+                            button_pile([button])]),
                       title=_("Applying network config"))
         super().__init__(box)