X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Fplayer_bits.py;h=6eeef0905ac0f0b0c76a048c0721aea253e7ab4e;hb=29c8196f7013ab28e4ad7628dd03c4b219ef465c;hp=fff8b0dffaccea301471a9831f32e3888b4d1047;hpb=85f20ca165c1710c96afbc42fa07acb68b6b4c1d;p=naja.git diff --git a/naja/widgets/player_bits.py b/naja/widgets/player_bits.py index fff8b0d..6eeef09 100644 --- a/naja/widgets/player_bits.py +++ b/naja/widgets/player_bits.py @@ -8,6 +8,7 @@ from naja.constants import BIT_SIZE, BITS from naja.resources import resources from naja.resources.mutators import R90, R180, R270, EIGHT_BIT from naja.widgets.base import Widget +from naja.widgets.text import TextWidget class PlayerBitsWidget(Widget): @@ -20,11 +21,20 @@ class PlayerBitsWidget(Widget): def prepare(self): self.surface = pygame.Surface(BIT_SIZE) + + size = BIT_SIZE[1] + + zero = TextWidget((0, 0), '0', fontsize=24, colour='white') + one = TextWidget((0, 0), '1', fontsize=24, colour='white') + zero.prepare() + zero.pos = (0, (size - zero.size[1])) + one.pos = zero.pos + bits = ( (BITS.MSB, 'msb', ()), - (BITS.YELLOW, 'yellow', ()), - (BITS.MAGENTA, 'magenta', ()), - (BITS.CYAN, 'cyan', ()), + (BITS.RED, 'red', ()), + (BITS.GREEN, 'green', ()), + (BITS.BLUE, 'blue', ()), (BITS.WEST, 'arrow', (R90,)), (BITS.EAST, 'arrow', (R270,)), (BITS.SOUTH, 'arrow', (R180,)), @@ -35,7 +45,12 @@ class PlayerBitsWidget(Widget): img = resources.get_image( 'bits', '%s_%s.png' % (image, 'on' if is_set else 'off'), transforms=transforms + (EIGHT_BIT,)) - self.surface.blit(img, (img.get_width() * pos, 0)) + self.surface.blit(img, (size * pos, 0)) + if is_set: + one.render(self.surface) + else: + zero.render(self.surface) + one.pos = zero.pos = (zero.pos[0] + size, zero.pos[1]) def draw(self, surface): surface.blit(self.surface, self.pos)