X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/1949ce08d8bd0e485280de3039c1c103522d7c2d..7fa3a2ce5331c49d0df4ae103abc193e682d48cf:/src/app/widgets/playingscreen.py

diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py
index 146e549..cf4b0ae 100755
--- a/src/app/widgets/playingscreen.py
+++ b/src/app/widgets/playingscreen.py
@@ -22,7 +22,7 @@ OFF_SATURATION = 1
 ON_TOP_LUMINANCE = 0.6
 ON_BOTTOM_LUMINANCE = 0.9
 ON_SATURATION = 1
-ON_COLUMN_OVERSIZING = 1.5
+ON_COLUMN_OVERSIZING = 2
 
 
 class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :
@@ -80,7 +80,7 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) :
             self.add(c)
     
     def _initCursor(self) :
-        self.cursor = WarpingCursor()
+        self.cursor = WarpingCursor(blinkMode=True)
         self.add(self.cursor)
         
         
@@ -129,7 +129,7 @@ class SongPlayingScreenTest(_PlayingScreenBase) :
         super(SongPlayingScreenTest, self).__init__([o])
     
 
-class Column(pygame.sprite.Sprite) :
+class Column(pygame.sprite.Sprite, EventHandlerMixin) :
     
     def __init__(self, hue, rect) :
         pygame.sprite.Sprite.__init__(self)
@@ -141,7 +141,8 @@ class Column(pygame.sprite.Sprite) :
         
         topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION)
         bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION)
-        rectOn = rect.inflate(ON_COLUMN_OVERSIZING * rect.width, 0)
+        rectOn = pygame.Rect((rect.left - rect.width/2, 0),
+                             (rect.width * ON_COLUMN_OVERSIZING, rect.height))
         self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
         self.rectOn = rectOn
         
@@ -155,6 +156,15 @@ class Column(pygame.sprite.Sprite) :
         else :
             self.image = self.stateOff
             self.rect = self.rectOff
+    
+    @event_handler(pygame.MOUSEBUTTONDOWN)
+    def onMouseDown(self, event) :
+        if self.rect.collidepoint(*event.pos) :
+            self.update(True)
+
+    @event_handler(pygame.MOUSEBUTTONUP)
+    def onMouseUp(self, event) :
+        self.update(False)
         
 def hls_to_rgba_8bits(h, l, s) :
     #convert to rgb ranging from 0 to 255