X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Finfo_area.py;h=2f75a635b3bb9096f329204020476174aabd123f;hb=0c5003d45e57223eca4a995952517648a9baa465;hp=c8c021a165e5512f6c407af41ce62d4be56fe39f;hpb=25d1332b1c51c542a545ca937d195aef572228c4;p=naja.git diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py index c8c021a..2f75a63 100644 --- 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 @@ -55,8 +56,13 @@ class InfoAreaWidget(Widget): # 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=PALETTE.LIGHT_TURQUOISE) + 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 @@ -80,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)