Utilisation de deux polices : Arial Unicode pas top pour les paroles.

[minwii.git] / src / app / widgets / column.py

diff --git a/src/app/widgets/column.py b/src/app/widgets/column.py
index 92f53ba..94fddcc 100755 (executable)
--- a/src/app/widgets/column.py
+++ b/src/app/widgets/column.py
@@ -18,7 +18,7 @@ from config import ON_BOTTOM_LUMINANCE
 from config import ON_SATURATION
 from config import ON_COLUMN_OVERSIZING
 from config import ON_COLUMN_ALPHA
-from config import FONT
+from config import LYRICS_FONT, NOTES_FONT
 from config import FONT_COLOR
 
 
@@ -30,7 +30,7 @@ class Column(pygame.sprite.DirtySprite) :
         
         # nom de l'intonation
         self.tone = tone
-        toneName = FONT.render(tone.nom, True, FONT_COLOR)
+        toneName = NOTES_FONT.render(tone.nom, True, FONT_COLOR)
         
         # état off : surface unie et nom de l'intonation
         sur = pygame.surface.Surface(rect.size)
@@ -70,14 +70,27 @@ class Column(pygame.sprite.DirtySprite) :
             sur = self.surOn
             if syllabus :
                 sur = sur.copy()
-                renderedSyl = FONT.render(syllabus, True, FONT_COLOR)
+                rect = self.rectOn
+                renderedSyl = LYRICS_FONT.render(syllabus, True, FONT_COLOR)
                 sw, sh, = renderedSyl.get_size()
                 w, h = self.rectOn.w, self.rectOn.h
+
+                if sw > self.rectOn.w :
+                    sur = pygame.transform.scale(sur, (sw, h))
+                    rect = rect.inflate(sw - w, 0)
+                    w = sw
+                
+                screenWidth = group.dispWidth
+                if rect.left < 0 :
+                    rect.left = 0
+                elif rect.right > screenWidth :
+                    rect.right = screenWidth
+
                 sylRect = pygame.Rect(((w - sw) / 2, (h - sh) / 2), (sw, sh))
                 sur.blit(renderedSyl, sylRect)
                 
             self.image = sur
-            self.rect = self.rectOn
+            self.rect = rect
         else :
             group.change_layer(self, BACKGROUND_LAYER)
             self.image = self.surOff