célesta une octave plus haute.

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

diff --git a/src/app/widgets/column.py b/src/app/widgets/column.py
index 667903c..e55b935 100755 (executable)
--- a/src/app/widgets/column.py
+++ b/src/app/widgets/column.py
@@ -6,11 +6,11 @@ $Id$
 $URL$
 """
 import pygame
 $URL$
 """
 import pygame

-from colorsys import hls_to_rgb

 from gradients import gradients
 from math import floor
 from globals import BACKGROUND_LAYER
 from globals import FOREGROUND_LAYER
 from gradients import gradients
 from math import floor
 from globals import BACKGROUND_LAYER
 from globals import FOREGROUND_LAYER

+from globals import hls_to_rgba_8bits

 from config import OFF_LUMINANCE
 from config import OFF_SATURATION
 from config import ON_TOP_LUMINANCE
 from config import OFF_LUMINANCE
 from config import OFF_SATURATION
 from config import ON_TOP_LUMINANCE


@@ -24,7 +24,7 @@ from config import FONT_COLOR
 
 class Column(pygame.sprite.DirtySprite) :
     
 
 class Column(pygame.sprite.DirtySprite) :
     

-    def __init__(self, group, hue, rect, tone) :
+    def __init__(self, group, hue, rect, tone, atBorder) :

         pygame.sprite.DirtySprite.__init__(self, group)
         self.state = False
         
         pygame.sprite.DirtySprite.__init__(self, group)
         self.state = False
         


@@ -51,6 +51,9 @@ class Column(pygame.sprite.DirtySprite) :
         onLeft = rect.centerx - onWidth / 2
         rectOn = pygame.Rect((onLeft, 0),
                              (onWidth, rect.height))
         onLeft = rect.centerx - onWidth / 2
         rectOn = pygame.Rect((onLeft, 0),
                              (onWidth, rect.height))

+        if atBorder :
+            setattr(rectOn, atBorder, getattr(rect, atBorder))
+

         self.surOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
         w, h = rectOn.w, rectOn.h
         toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))
         self.surOn = gradients.vertical(rectOn.size, topRgba, bottomRgba)
         w, h = rectOn.w, rectOn.h
         toneRect = pygame.Rect(((w - tw) / 2, h - th), (tw, th))


@@ -59,8 +62,6 @@ class Column(pygame.sprite.DirtySprite) :
         
         self.image = self.surOff
         self.rect = rect
         
         self.image = self.surOff
         self.rect = rect

-        #EventDispatcher.addEventListener(pygame.MOUSEBUTTONDOWN, self.onMouseDown)
-        #EventDispatcher.addEventListener(pygame.MOUSEBUTTONUP, self.onMouseUp)

     
     def update(self, state, syllabus='') :
         group = self.groups()[0]
     
     def update(self, state, syllabus='') :
         group = self.groups()[0]


@@ -87,8 +88,3 @@ class Column(pygame.sprite.DirtySprite) :
         self.state = state
         self.dirty = 1    
 
         self.state = state
         self.dirty = 1    
 

-        
-def hls_to_rgba_8bits(h, l, s, a=1) :
-    #convert to rgb ranging from 0 to 255
-    rgba = [floor(255 * i) for i in hls_to_rgb(h, l, s) + (a,)]
-    return tuple(rgba)