Use location bit glyphs in action text.

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

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index c92a0b021e4fea18c3389351fbb46a6ffb4362cb..2f75a635b3bb9096f329204020476174aabd123f 100644 (file)
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -10,6 +10,7 @@ from naja.events import finish_event
 from naja.resources import resources
 from naja.resources.mutators import EIGHT_BIT
 from naja.sound import sound
+from naja.utils import bit_glyphs
 
 from naja.widgets.base import Widget
 from naja.widgets.tile import BIT_MAP
@@ -48,14 +49,20 @@ class InfoAreaWidget(Widget):
         self.surface.fill((0, 0, 0))
         # Extract actions and such from the card
         title = TextWidget((0, 0), TITLES[self.state.gameboard.player_mode],
-                           colour=(255, 255, 255))
+                           colour=PALETTE.WHITE)
         title.render(self.surface)
         y_offset = title.surface.get_rect().height + 8
 
         # TODO: Make this better.
         bits_text = ''.join('1' if bit in self.card.bitwise_operand else '0'
                             for bit in reversed(range(8)))
-        card_bits = TextWidget((0, y_offset), bits_text, colour=(255, 255, 0))
+        if self.card.bitwise_operand:
+            bits_text = '%s %s' % (
+                bits_text, bit_glyphs(self.card.bitwise_operand))
+        card_bits = TextBoxWidget((0, y_offset), bits_text,
+                                  box_width=INFO_SIZE[0],
+                                  colour=PALETTE.LIGHT_TURQUOISE,
+                                  bg_colour=PALETTE.BLACK)
         card_bits.render(self.surface)
         y_offset += card_bits.surface.get_rect().height + 8
 
@@ -79,7 +86,7 @@ class InfoAreaWidget(Widget):
         text_colour = PALETTE.BLACK if action_viable else PALETTE.GREY
 
         text = TextBoxWidget(
-            (x_offset, y_offset), action.get_text(),
+            (x_offset, y_offset), action.get_text(self.card),
             box_width=(INFO_SIZE[0] - 16) // EIGHT_BIT_SCALE,
             fontsize=28, colour=text_colour)
         text.render(self.surface)