'SOUTH': ('glyphs/arrow_down.png', None),
'EAST': ('glyphs/arrow_right.png', None),
'WEST': ('glyphs/arrow_left.png', None),
+ 'RETURN': ('glyphs/return.png', None),
'HEALTH': ('glyphs/health.png', PALETTE.DARK_RED),
'WINTOKEN': ('glyphs/win.png', PALETTE.DARK_OLIVE),
'KEY': ('glyphs/key.png', None),
'BLUE': ('glyphs/key.png', PALETTE.BLUE),
'CLOCKWISE': ('glyphs/clockwise.png', None),
'ANTICLOCKWISE': ('glyphs/anticlockwise.png', None),
+ 'SHIFT_LEFT': ('glyphs/shift_left.png', None),
+ 'SHIFT_RIGHT': ('glyphs/shift_right.png', None),
+ 'COUNTDOWN': ('glyphs/countdown_4.png', PALETTE.DARK_VIOLET),
'HEALTH_NOCOLOUR': ('glyphs/health.png', None),
'WINTOKEN_NOCOLOUR': ('glyphs/win.png', None),
def __init__(self, pos, text, fontname=None, fontsize=None,
colour=None, unselectable_colour=None, view_port=None,
- centre=False):
+ centre=False, border=0, border_colour=PALETTE.GREY,
+ padding=2):
super(TextWidget, self).__init__(pos)
self.text = text
pygame.Rect((0, 0), view_port) if view_port is not None else None)
self.centre = centre
self.centre_pos = pos
+ self.border = border
+ self.border_colour = convert_colour(border_colour)
+ self.padding = padding
def render_line(self, text):
colour = self.colour
text_surf, (text_rect.width * EIGHT_BIT_SCALE,
text_rect.height * EIGHT_BIT_SCALE))
+ def render_border(self, surface):
+ if not self.border or not self.border_colour:
+ return
+ rect = surface.get_rect()
+ rect = rect.inflate(- self.border / 2, - self.border / 2)
+ pygame.draw.rect(surface, self.border_colour, rect, self.border)
+
def update_size(self):
if self.view_port is not None:
self.size = self.view_port.size
def prepare(self):
self.font = resources.get_font(self.fontname, self.fontsize)
self.surface = self.render_line(self.text)
+ self.render_border(self.surface)
self.update_size()
def handle_event(self, ev):
class TextBoxWidget(TextWidget):
def __init__(self, *args, **kwargs):
- self.padding = kwargs.pop('padding', 4)
- self.border = kwargs.pop('border', 2)
self.bg_colour = convert_colour(kwargs.pop('bg_colour',
PALETTE.LIGHT_VIOLET))
- self.border_colour = convert_colour(kwargs.pop('border_colour',
- PALETTE.BLACK))
self.box_width = kwargs.pop('box_width', 0)
+ self.full_width = kwargs.pop('full_width', True)
+ kwargs.setdefault('padding', 4)
super(TextBoxWidget, self).__init__(*args, **kwargs)
- def lines(self, image_map):
+ def lines(self):
if self.box_width != 0:
- return self._wrapped_lines(image_map)
+ return self._wrapped_lines()
else:
- return self.text.splitlines()
+ return ((line, []) for line in self.text.splitlines())
- def _prepare_glyph(self, image_map, glyph, current_words, lines):
+ def _prepare_glyph(self, glyph, current_words):
+ glyphs = []
size = self.font.size(' '.join(current_words[:-1] + ['']))
- x = size[0] * EIGHT_BIT_SCALE + self.padding
- y = size[1] * lines * EIGHT_BIT_SCALE + self.padding
+ x = size[0] * EIGHT_BIT_SCALE
for glyph_key in glyph.glyph_keys:
image_name, colour = MARKUP_MAP[glyph_key]
if colour is None:
colour = self.colour
image = resources.get_image(
image_name, transforms=(EIGHT_BIT, blender(colour)))
- image_map[(x, y)] = image
+ glyphs.append(((x, 0), image))
x += image.get_width()
+ return glyphs
def _check_markup(self, word):
suffix = ''
- if word[-1] in '.,':
+ if word[-1] in '.,:':
suffix = word[-1]
word = word[:-1]
+ if not word:
+ return None
if word[0] == '{' and word[-1] == '}':
subwords = word[1:-1].split(',')
if all(subword in MARKUP_MAP for subword in subwords):
return None
- def _wrapped_lines(self, image_map):
+ def _wrapped_lines(self):
def words_fit(words):
words_line = ' '.join(words)
width = self.font.size(words_line)[0] * EIGHT_BIT_SCALE
line = line.strip()
if not line:
line_count += 1
- yield line
+ yield (line, [])
continue
- current_words = []
+ current_words, glyphs = [], []
remaining_words = line.split()
while remaining_words:
word = remaining_words.pop(0)
current_words.append(word)
if words_fit(current_words):
if glyph is not None:
- self._prepare_glyph(
- image_map, glyph, current_words, line_count)
+ glyphs.extend(self._prepare_glyph(
+ glyph, current_words))
else:
line_count += 1
- yield ' '.join(current_words[:-1])
- current_words = []
+ yield (' '.join(current_words[:-1]), glyphs)
+ current_words, glyphs = [], []
if glyph is not None:
word = glyph.markup_text
remaining_words.insert(0, word)
if current_words and words_fit(current_words):
line_count += 1
- yield ' '.join(current_words)
+ yield (' '.join(current_words), glyphs)
def prepare(self):
self.font = resources.get_font(self.fontname, self.fontsize)
- image_map = {}
rendered_lines = []
width, height = self.padding * 2, self.padding * 2
- for line in self.lines(image_map):
+ for line, glyphs in self.lines():
line_surface = self.render_line(line)
line_rect = line_surface.get_rect()
rendered_lines.append(line_surface)
width = max(width, line_rect.width + self.padding * 2)
height += line_rect.height
+ for pos, img in glyphs:
+ line_surface.blit(img, pos)
+
+ if self.full_width:
+ width = max(width, self.box_width)
self.surface = pygame.surface.Surface((width, height),
pygame.locals.SRCALPHA)
x, y = self.padding, self.padding
for line_surface in rendered_lines:
+ if self.centre:
+ x = (width - line_surface.get_rect().width) / 2
+ x += self.padding
self.surface.blit(line_surface, (x, y))
y += line_surface.get_rect().height
- for pos, img in image_map.items():
- self.surface.blit(img, pos)
+
+ self.render_border(self.surface)
projects / naja.git / blobdiff