bugfix : on ne loggait pas le bon état.

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

diff --git a/src/app/widgets/column.py b/src/app/widgets/column.py
index 4e8678b..bf1fb90 100755 (executable)
--- a/src/app/widgets/column.py
+++ b/src/app/widgets/column.py
@@ -18,19 +18,23 @@ 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
+import events
 
 
 class Column(pygame.sprite.DirtySprite) :
+    ''' colonne utilisée pour l'affichage d'une touche du clavier de jeu.
+    '''
     
-    def __init__(self, group, hue, rect, tone) :
+    def __init__(self, group, index, hue, rect, tone) :
         pygame.sprite.DirtySprite.__init__(self, group)
+        self.index = index
         self.state = False
         
         # 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)
@@ -71,7 +75,7 @@ class Column(pygame.sprite.DirtySprite) :
             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
 
@@ -95,6 +99,9 @@ class Column(pygame.sprite.DirtySprite) :
             group.change_layer(self, BACKGROUND_LAYER)
             self.image = self.surOff
             self.rect = self.rectOff
+
         self.state = state
-        self.dirty = 1    
+        self.dirty = 1
 
+        evt = pygame.event.Event(events.COLSTATECHANGE, column=self, state=state, syllabus=syllabus)
+        pygame.event.post(evt)