Changeset 33:d9b65cf72db4

Timestamp:

09/01/13 14:44:04 (9 years ago)

Author:

Stefano Rivera <stefano@…>

Branch:

default

Phase:

public

Rebase:

64626663363137386262386465656438376463633931366130343239613161393766653462663861

Message:

Prettier resource loading module

Files:

• data/__init__.py (added)
• nagslang/data.py (deleted)
• nagslang/resources.py (added)
• nagslang/widgets/text.py (modified) (2 diffs)

nagslang/widgets/text.py

@@ -1 @@
-import pygame
-
 from nagslang.constants import FONT, FONT_SIZE
-from nagslang.data import filepath
 from nagslang.widgets.base import Widget
 from nagslang.utils import convert_colour
+from nagslang.resources import resources
 
 
 class TextWidget(Widget):
-    fonts = {}
-
     def __init__(self, pos, text, size=None, fontname=None, fontsize=None,
                  colour=None):
@@ -22 +18 @@
 
     def prepare(self):
-        font = (self.fontname, self.fontsize)
-        if font not in TextWidget.fonts:
-            fn = filepath('fonts/' + self.fontname)
-            TextWidget.fonts[font] = pygame.font.Font(fn, self.fontsize)
-        self.font = TextWidget.fonts[font]
+        self.font = resources.get_font(self.fontname, self.fontsize)
         self.surface = self.font.render(self.text, True, self.colour)
         self.text_rect = self.surface.get_rect()