From 3e460450c1baa9af43f5391ba4673a599071656b Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sat, 17 May 2014 01:26:27 +0200 Subject: [PATCH] Take EIGHT_BIT_SCALE into account, in box_width --- naja/scenes/credits.py | 4 ++-- naja/scenes/howto.py | 2 +- naja/widgets/info_area.py | 7 +++---- naja/widgets/text.py | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/naja/scenes/credits.py b/naja/scenes/credits.py index 05493dd..1558142 100644 --- a/naja/scenes/credits.py +++ b/naja/scenes/credits.py @@ -29,13 +29,13 @@ class CreditsScene(Scene): 'Neil Muller, Simon Cross & Stefano Rivera', fontsize=32, colour='white', padding=1, border=1, bg_colour='black', border_colour='black', - box_width=320)) + box_width=640)) self.add(TextBoxWidget( (30, 280), 'Music by Rolemusic: http://rolemusic.sawsquarenoise.com/', fontsize=32, colour='white', padding=1, border=1, bg_colour='black', border_colour='black', - box_width=320)) + box_width=640)) def handle_scene_event(self, ev): if ev.type == pgl.KEYDOWN and ev.key in KEYS.QUIT: diff --git a/naja/scenes/howto.py b/naja/scenes/howto.py index 641b302..b231dc3 100644 --- a/naja/scenes/howto.py +++ b/naja/scenes/howto.py @@ -51,7 +51,7 @@ class HowtoScene(Scene): ]), fontsize=32, colour='white', padding=1, border=1, bg_colour='black', border_colour='black', - box_width=360, view_port=(780, 540))) + box_width=740, view_port=(780, 540))) def handle_scene_event(self, ev): from naja.scenes.menu import MenuScene diff --git a/naja/widgets/info_area.py b/naja/widgets/info_area.py index c7617f2..ef3f017 100644 --- 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 @@ -77,7 +77,7 @@ class InfoAreaWidget(Widget): hint_text += HINT_LEGAL_MOVE hint = TextBoxWidget((4, 0), hint_text, padding=2, - box_width=(INFO_SIZE[0] - 4) // EIGHT_BIT_SCALE) + box_width=(INFO_SIZE[0] - 4)) hint.prepare() y_offset = ( INFO_SIZE[1] - hint.surface.get_rect().height - INFO_LEFT_PADDING @@ -94,8 +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, - fontsize=28, colour=text_colour) + box_width=(INFO_SIZE[0] - 16), fontsize=28, colour=text_colour) text.render(self.surface) border_colour = None diff --git a/naja/widgets/text.py b/naja/widgets/text.py index 4cc4272..6862b96 100644 --- a/naja/widgets/text.py +++ b/naja/widgets/text.py @@ -170,7 +170,7 @@ class TextBoxWidget(TextWidget): def _wrapped_lines(self, image_map): def words_fit(words): words_line = ' '.join(words) - width = self.font.size(words_line)[0] + width = self.font.size(words_line)[0] * EIGHT_BIT_SCALE if width < self.box_width: return True elif len(words) == 1: -- 2.34.1