Merge branch 'master' of git://ctpug.org.za/naja

[naja.git] / naja / widgets / info_area.py

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index 97c3daacc261411052e0e379b865c105c12074cc..1ff6bbbd92168e52ec12c4a489cf6f54638f95a7 100644 (file)
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -57,24 +57,21 @@ class InfoAreaWidget(Widget):
         y_offset = 0
         pos = lambda: (INFO_LEFT_PADDING, y_offset)
 
-        # Top title
-        title = TextWidget(
-            pos(), TITLES[self.state.gameboard.player_mode],
-            colour=PALETTE.WHITE)
-        title.render(self.surface)
-        y_offset += title.surface.get_rect().height - 4
-
         # Bits
+        y_offset += 12
         bits_text = ''.join('1' if bit in self.card.bitwise_operand else '0'
                             for bit in reversed(range(8)))
         if self.card.bitwise_operand:
             bits_text = '%s %s' % (
                 bits_text, bit_glyphs(self.card.bitwise_operand))
         card_bits = TextBoxWidget(
-            pos(), bits_text, box_width=box_width,
-            colour=PALETTE.LIGHT_TURQUOISE, bg_colour=PALETTE.BLACK)
-        card_bits.render(self.surface)
-        y_offset += card_bits.surface.get_rect().height + 4
+            (0, 0), bits_text, padding=4, centre=True,
+            colour=PALETTE.WHITE, border=2,
+            bg_colour=PALETTE.BLACK, border_colour=PALETTE.BLUE,
+            box_width=box_width)
+        card_bits.prepare()
+        self.surface.blit(card_bits.surface, pos())
+        y_offset += card_bits.surface.get_rect().height + 12
 
         # Actions
         for choice, action in enumerate(self.card.actions):
@@ -119,7 +116,7 @@ class InfoAreaWidget(Widget):
 
     def prepare_action(self, choice, action, y_offset, box_width):
         x_offset = INFO_LEFT_PADDING
-        glyphs_x_offset = 0
+        glyphs_x_offset = 2
         glyphs_y_offset = y_offset
         y_offset += ACTION_TEXT_OFFSET
         action_viable = action.check_available(self.state.player)