From adc94b74d51f5e20faac9b98257463eb918585fd Mon Sep 17 00:00:00 2001 From: Neil Date: Thu, 15 May 2014 10:52:44 +0200 Subject: [PATCH] Draw locks on infobar above the text --- naja/widgets/info_area.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py index 25dd653..866fb86 100644 --- a/naja/widgets/info_area.py +++ b/naja/widgets/info_area.py @@ -70,19 +70,11 @@ class InfoAreaWidget(Widget): self.surface.blit(hint.surface, (4, y_offset)) def prepare_action(self, choice, action, y_offset): - if action.required_bits: - img_name = BIT_MAP[action.required_bits].replace( - '.png', '_small.png') - img = resources.get_image(img_name, - transforms=(EIGHT_BIT,)) - self.surface.blit(img, (0, y_offset)) - y_offset += 8 text = TextBoxWidget( - (12, y_offset), action.get_text(), - box_width=(INFO_SIZE[0] - 12) // EIGHT_BIT_SCALE, + (18, y_offset), action.get_text(), + box_width=(INFO_SIZE[0] - 16) // EIGHT_BIT_SCALE, fontsize=28) text.render(self.surface) - # self.chosen may be None, in which case we don't draw the border. if choice == self.chosen: if not action.check_available(self.state.player): @@ -92,8 +84,14 @@ class InfoAreaWidget(Widget): bottom = y_offset + text.surface.get_rect().height right = text.surface.get_rect().width + 12 pygame.draw.lines(self.surface, colour, True, - [(12, y_offset), (right, y_offset), - (right, bottom), (12, bottom)], 4) + [(18, y_offset), (right, y_offset), + (right, bottom), (18, bottom)], 4) + if action.required_bits: + img_name = BIT_MAP[action.required_bits].replace( + '.png', '_small.png') + img = resources.get_image(img_name, + transforms=(EIGHT_BIT,)) + self.surface.blit(img, (0, y_offset)) return y_offset + text.surface.get_rect().height + 16 def set_position(self, position): -- 2.34.1