Tweak infobar layout yet again

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

diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py
index c7617f2e1a2700c1370a468f84dace18ca85b67e..a122b6fdef08c4dfa1b782590b9584218b4f9d61 100644 (file)
--- a/naja/widgets/info_area.py
+++ b/naja/widgets/info_area.py
@@ -5,7 +5,7 @@ import pygame
 import pygame.locals as pgl
 
 from naja.constants import (
-    INFO_SIZE, EIGHT_BIT_SCALE, ACT, KEYS, EXAMINE, PALETTE,
+    INFO_SIZE, ACT, KEYS, EXAMINE, PALETTE,
     ACTION_TEXT_OFFSET, INFO_LEFT_PADDING)
 from naja.events import finish_event
 from naja.resources import resources
@@ -53,7 +53,7 @@ class InfoAreaWidget(Widget):
             (INFO_LEFT_PADDING, 0), TITLES[self.state.gameboard.player_mode],
             colour=PALETTE.WHITE)
         title.render(self.surface)
-        y_offset = title.surface.get_rect().height + 8
+        y_offset = title.surface.get_rect().height - 4
 
         # TODO: Make this better.
         bits_text = ''.join('1' if bit in self.card.bitwise_operand else '0'
@@ -62,11 +62,11 @@ class InfoAreaWidget(Widget):
             bits_text = '%s %s' % (
                 bits_text, bit_glyphs(self.card.bitwise_operand))
         card_bits = TextBoxWidget((INFO_LEFT_PADDING, y_offset), bits_text,
-                                  box_width=INFO_SIZE[0],
+                                  box_width=(INFO_SIZE[0] - INFO_LEFT_PADDING),
                                   colour=PALETTE.LIGHT_TURQUOISE,
                                   bg_colour=PALETTE.BLACK)
         card_bits.render(self.surface)
-        y_offset += card_bits.surface.get_rect().height + 8
+        y_offset += card_bits.surface.get_rect().height + 4
 
         for choice, action in enumerate(self.card.actions):
             y_offset = self.prepare_action(choice, action, y_offset)
@@ -76,8 +76,8 @@ class InfoAreaWidget(Widget):
             if self.card_position in self.state.player.legal_moves():
                 hint_text += HINT_LEGAL_MOVE
 
-        hint = TextBoxWidget((4, 0), hint_text, padding=2,
-                             box_width=(INFO_SIZE[0] - 4) // EIGHT_BIT_SCALE)
+        hint = TextBoxWidget((0, 0), hint_text, padding=4,
+                             box_width=(INFO_SIZE[0] - INFO_LEFT_PADDING - 8))
         hint.prepare()
         y_offset = (
             INFO_SIZE[1] - hint.surface.get_rect().height - INFO_LEFT_PADDING
@@ -94,7 +94,7 @@ class InfoAreaWidget(Widget):
 
         text = TextBoxWidget(
             (x_offset, y_offset), action.get_text(self.card),
-            box_width=(INFO_SIZE[0] - 16) // EIGHT_BIT_SCALE,
+            box_width=(INFO_SIZE[0] - INFO_LEFT_PADDING - 8),
             fontsize=28, colour=text_colour)
         text.render(self.surface)