X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Ftext.py;h=3df09488e3a170502426b79d7724b196d2d22c32;hb=023db05135e4a7b6d3bd4726de475dcdbf386372;hp=587cb3c675cbb03f3395f3a90a9fa6befc41a5ea;hpb=cf09c0ae37a8fa9be5d2ac5134c316682e97f95f;p=naja.git diff --git a/naja/widgets/text.py b/naja/widgets/text.py index 587cb3c..3df0948 100644 --- a/naja/widgets/text.py +++ b/naja/widgets/text.py @@ -132,7 +132,8 @@ class TextBoxWidget(TextWidget): self.border_colour = convert_colour(kwargs.pop('border_colour', PALETTE.BLACK)) self.box_width = kwargs.pop('box_width', 0) - self.centre = kwargs.pop('centre', False) + + self.full_width = kwargs.pop('full_width', True) super(TextBoxWidget, self).__init__(*args, **kwargs) @@ -220,6 +221,9 @@ class TextBoxWidget(TextWidget): width = max(width, line_rect.width + self.padding * 2) height += line_rect.height + if self.full_width: + width = max(width, self.box_width) + self.surface = pygame.surface.Surface((width, height), pygame.locals.SRCALPHA) self.surface.fill(self.bg_colour) @@ -227,10 +231,9 @@ class TextBoxWidget(TextWidget): x, y = self.padding, self.padding for line_surface in rendered_lines: - if self.centre and self.box_width: + if self.centre: x = (width - line_surface.get_rect().width) / 2 x += self.padding - print x, width, line_surface.get_rect().width self.surface.blit(line_surface, (x, y)) y += line_surface.get_rect().height for pos, img in image_map.items():