More PALETTE

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

diff --git a/naja/widgets/text.py b/naja/widgets/text.py
index 22914009f3a49fef75db2c115f7d59ada839d4b3..0dea54067b08f104707939873f9ae194d3b7d5a9 100644 (file)
--- a/naja/widgets/text.py
+++ b/naja/widgets/text.py
@@ -1,8 +1,8 @@
 import pygame
 
-from naja.constants import FONT, FONT_SIZE, EIGHT_BIT_SCALE
+from naja.constants import FONT, FONT_SIZE, EIGHT_BIT_SCALE, PALETTE
 from naja.resources import resources
-from naja.resources.mutators import EIGHT_BIT
+from naja.resources.mutators import EIGHT_BIT, blender
 from naja.utils import convert_colour
 from naja.widgets.base import Widget
 
@@ -24,7 +24,7 @@ class TextWidget(Widget):
         self.text = text
         self.fontname = fontname or FONT
         self.fontsize = (fontsize or FONT_SIZE) // EIGHT_BIT_SCALE
-        self.colour = convert_colour(colour or (0, 0, 0))
+        self.colour = convert_colour(colour or PALETTE.BLACK)
 
     def render_line(self, text):
         text_surf = self.font.render(text, True, self.colour)
@@ -47,9 +47,9 @@ class TextBoxWidget(TextWidget):
         self.padding = kwargs.pop('padding', 5)
         self.border = kwargs.pop('border', 2)
         self.bg_colour = convert_colour(kwargs.pop('bg_colour',
-                                                   (255, 255, 255, 192)))
+                                                   PALETTE.LIGHT_VIOLET))
         self.border_colour = convert_colour(kwargs.pop('border_colour',
-                                                       (0, 0, 0)))
+                                                       PALETTE.BLACK))
         self.box_width = kwargs.pop('box_width', 0)
 
         super(TextBoxWidget, self).__init__(*args, **kwargs)
@@ -91,7 +91,8 @@ class TextBoxWidget(TextWidget):
                                size[1] * line_count * EIGHT_BIT_SCALE)
                         pos = (pos[0] + self.padding, pos[1] + self.padding)
                         image_map[pos] = resources.get_image(
-                            markup_data[1], transforms=(EIGHT_BIT,))
+                            markup_data[1],
+                            transforms=(EIGHT_BIT, blender(self.colour)))
                         continue
                 else:
                     line_count += 1