Utilisation de la police "Arial Unicode.ttf" qui comporte le caractère « ♭ ».

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

diff --git a/src/app/widgets/column.py b/src/app/widgets/column.py
index 92f53ba..4e8678b 100755 (executable)
--- a/src/app/widgets/column.py
+++ b/src/app/widgets/column.py
@@ -70,14 +70,27 @@ class Column(pygame.sprite.DirtySprite) :
             sur = self.surOn
             if syllabus :
                 sur = sur.copy()
             sur = self.surOn
             if syllabus :
                 sur = sur.copy()

+                rect = self.rectOn

                 renderedSyl = FONT.render(syllabus, True, FONT_COLOR)
                 sw, sh, = renderedSyl.get_size()
                 w, h = self.rectOn.w, self.rectOn.h
                 renderedSyl = 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
                 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
         else :
             group.change_layer(self, BACKGROUND_LAYER)
             self.image = self.surOff