X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/f6ca219fa69085fbbf9feff7ab72c51e805bc9bb..dc8216d3cd94fe2a5d89c6e8a4fae5de2f25bc9b:/src/app/widgets/playingscreen.py

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 2635373..47898fa 100755
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -57,8 +57,8 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         screen = pygame.display.get_surface()
 
         # taille de la zone d'affichage utile (bordure autour)
-        dispWidth = screen.get_width() - 2 * BORDER
-        dispHeight = screen.get_height() - 2 * BORDER
+        self.dispWidth  = dispWidth = screen.get_width() - 2 * BORDER
+        self.dispHeight = dispHeight = screen.get_height() - 2 * BORDER
         
         columnWidth = int(round(float(dispWidth) / self.keyboardLength))
 
@@ -76,12 +76,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         for i, rect in enumerate(self.keyboardRects) :
             hue = FIRST_HUE - hueStep * i
             tone = self.distinctNotes[i]
-            atBorder = False
-            if i == 0 :
-                atBorder = 'left'
-            elif i == self.keyboardLength -1 :
-                atBorder = 'right'
-            c = Column(self, hue, rect, tone, atBorder)
+            c = Column(self, i, hue, rect, tone)
             self.add(c, layer=BACKGROUND_LAYER)
             self.columns[tone.midi] = c
         
@@ -99,7 +94,7 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
             EventDispatcher.dispatchEvents()
             dirty = self.draw(pygame.display.get_surface())
             pygame.display.update(dirty)
-            clock.tick(FRAMERATE)
+            clock.tick()#FRAMERATE)
     
     def stop(self) :
         self._running = False
@@ -118,33 +113,33 @@ class _PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
         # parce qu'il s'agit du curseur
         for col in reversed(self.sprites()[:-1]) :
             if col.rect.collidepoint(*event.pos):
-                self.raiseColDown(col)
+                self.raiseColDown(col, event.pos)
                 break
 
     @event_handler(pygame.MOUSEBUTTONUP)
     def onMouseUp(self, event) :
         for col in reversed(self.sprites()[:-1]) :
             if col.rect.collidepoint(*event.pos) :
-                self.raiseColUp(col)
+                self.raiseColUp(col, event.pos)
                 break
 
     @event_handler(pygame.MOUSEMOTION)
     def onMouseMove(self, event) :
         for col in reversed(self.sprites()[:-1]) :
             if col.rect.collidepoint(*event.pos) :
-                self.raiseColOver(col)
+                self.raiseColOver(col, event.pos)
                 break
 
-    def raiseColDown(self, col) :
-        evt = pygame.event.Event(events.COLDOWN, column=col)
+    def raiseColDown(self, col, pos) :
+        evt = pygame.event.Event(events.COLDOWN, column=col, pos=pos)
         pygame.event.post(evt)
 
-    def raiseColUp(self, col) :
-        evt = pygame.event.Event(events.COLUP, column=col)
+    def raiseColUp(self, col, pos) :
+        evt = pygame.event.Event(events.COLUP, column=col, pos=pos)
         pygame.event.post(evt)
     
-    def raiseColOver(self, col) :
-        evt = pygame.event.Event(events.COLOVER, column=col)
+    def raiseColOver(self, col, pos) :
+        evt = pygame.event.Event(events.COLOVER, column=col, pos=pos)
         pygame.event.post(evt)