Refactor info area preparation.

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index 1ba34d0b27ed235748b0426359faf50d4a2bc217..3e9152a34cf3630f6b49ef214d52e533e9ddee64 100644 (file)
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -45,27 +45,7 @@ class InfoAreaWidget(Widget):
         title.render(self.surface)
         y_offset = title.surface.get_rect().height + 8
         for choice, action in enumerate(self.card.actions):
-            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.TEXT,
-                box_width=(INFO_SIZE[0] - 12) // 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:
-                colour = (255, 255, 0, 128)
-                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)
-            y_offset += text.surface.get_rect().height + 16
+            y_offset = self.prepare_action(choice, action, y_offset)
         # We cheat horribly for layout reasons
         hint = TextBoxWidget((0, 0), HINTS[self.state.gameboard.player_mode],
                              box_width=INFO_SIZE[0] // EIGHT_BIT_SCALE)
@@ -73,6 +53,30 @@ class InfoAreaWidget(Widget):
         y_offset = INFO_SIZE[1] - hint.surface.get_rect().height
         self.surface.blit(hint.surface, (0, 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.TEXT,
+            box_width=(INFO_SIZE[0] - 12) // 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:
+            colour = (255, 255, 0, 128)
+            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)
+        return y_offset + text.surface.get_rect().height + 16
+
     def set_position(self, position):
         self.card = self.state.board_locations[position]
         if self.state.gameboard.player_mode == ACT: