élargissement de la colonne si jamais parole trop large. On va virer le « atBorder...

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

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index f5cbdb6..2635373 100755 (executable)
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -21,7 +21,7 @@ from config import DEFAULT_MIDI_VELOCITY
 
 from globals import BACKGROUND_LAYER
 from globals import CURSOR_LAYER
-from globals import PLAYING_MODES
+from globals import PLAYING_MODES_DICT
 
 class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
@@ -76,7 +76,12 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
             tone = self.distinctNotes[i]
-            c = Column(self, hue, rect, tone)
+            atBorder = False
+            if i == 0 :
+                atBorder = 'left'
+            elif i == self.keyboardLength -1 :
+                atBorder = 'right'
+            c = Column(self, hue, rect, tone, atBorder)
             self.add(c, layer=BACKGROUND_LAYER)
             self.columns[tone.midi] = c
         
@@ -169,17 +174,17 @@ class PlayingScreen(_PlayingScreenBase) :
 
 class SongPlayingScreen(_PlayingScreenBase) :
     
-    def __init__(self, synth, song, mode=PLAYING_MODES['EASY']) :
+    def __init__(self, synth, song, mode=PLAYING_MODES_DICT['EASY']) :
         super(SongPlayingScreen, self).__init__(synth, song.distinctNotes)
         self.song = song
         self.quarterNoteDuration = song.quarterNoteDuration
         self.currentColumn = None
         self.noteIterator = self.song.iterNotes()
         self.displayNext()
-        if mode == PLAYING_MODES['NORMAL'] :
+        if mode == PLAYING_MODES_DICT['NORMAL'] :
             EventDispatcher.addEventListener(events.COLDOWN, self.handleColumnDown)
             EventDispatcher.addEventListener(events.COLUP, self.handleColumnUp)
-        elif mode == PLAYING_MODES['EASY'] :
+        elif mode == PLAYING_MODES_DICT['EASY'] :
             EventDispatcher.addEventListener(events.COLOVER, self.handleColumnOver)