le logging commence à avoir une bonne tête.

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

diff --git a/src/app/widgets/column.py b/src/app/widgets/column.py
index 4e8678b..31266c8 100755 (executable)
--- a/src/app/widgets/column.py
+++ b/src/app/widgets/column.py
@@ -18,8 +18,9 @@ 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 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
 from config import FONT_COLOR

+import events

 
 
 class Column(pygame.sprite.DirtySprite) :
 
 
 class Column(pygame.sprite.DirtySprite) :


@@ -30,7 +31,7 @@ class Column(pygame.sprite.DirtySprite) :
         
         # nom de l'intonation
         self.tone = tone
         
         # 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)
         
         # état off : surface unie et nom de l'intonation
         sur = pygame.surface.Surface(rect.size)


@@ -71,7 +72,7 @@ class Column(pygame.sprite.DirtySprite) :
             if syllabus :
                 sur = sur.copy()
                 rect = self.rectOn
             if syllabus :
                 sur = sur.copy()
                 rect = self.rectOn

-                renderedSyl = FONT.render(syllabus, True, FONT_COLOR)
+                renderedSyl = LYRICS_FONT.render(syllabus, True, FONT_COLOR)

                 sw, sh, = renderedSyl.get_size()
                 w, h = self.rectOn.w, self.rectOn.h
 
                 sw, sh, = renderedSyl.get_size()
                 w, h = self.rectOn.w, self.rectOn.h
 


@@ -95,6 +96,9 @@ class Column(pygame.sprite.DirtySprite) :
             group.change_layer(self, BACKGROUND_LAYER)
             self.image = self.surOff
             self.rect = self.rectOff
             group.change_layer(self, BACKGROUND_LAYER)
             self.image = self.surOff
             self.rect = self.rectOff

+

         self.state = state
         self.dirty = 1    
 
         self.state = state
         self.dirty = 1    
 

+        evt = pygame.event.Event(events.COLSTATECHANGE, col=self, state=state, syllabus=syllabus)
+        pygame.event.post(evt)