X-Git-Url: https://scm.cri.ensmp.fr/git/minwii.git/blobdiff_plain/bf4fd0cf6bb79dffd32e4995f0b312fb1a32502f..5f3d5fdc66dc67db40c5021a44380283bf97c9f7:/src/app/widgets/column.py

diff --git a/src/app/widgets/column.py b/src/app/widgets/column.py
index 667903c..4e8678b 100755
--- a/src/app/widgets/column.py
+++ b/src/app/widgets/column.py
@@ -6,11 +6,11 @@ $Id$
 $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 globals import hls_to_rgba_8bits
 from config import OFF_LUMINANCE
 from config import OFF_SATURATION
 from config import ON_TOP_LUMINANCE
@@ -59,8 +59,6 @@ class Column(pygame.sprite.DirtySprite) :
         
         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]
@@ -72,14 +70,27 @@ class Column(pygame.sprite.DirtySprite) :
             sur = self.surOn
             if syllabus :
                 sur = sur.copy()
+                rect = self.rectOn
                 renderedSyl = FONT.render(syllabus, True, FONT_COLOR)
                 sw, sh, = renderedSyl.get_size()
                 w, h = self.rectOn.w, self.rectOn.h
+
+                if sw > self.rectOn.w :
+                    sur = pygame.transform.scale(sur, (sw, h))
+                    rect = rect.inflate(sw - w, 0)
+                    w = sw
+                
+                screenWidth = group.dispWidth
+                if rect.left < 0 :
+                    rect.left = 0
+                elif rect.right > screenWidth :
+                    rect.right = screenWidth
+
                 sylRect = pygame.Rect(((w - sw) / 2, (h - sh) / 2), (sw, sh))
                 sur.blit(renderedSyl, sylRect)
                 
             self.image = sur
-            self.rect = self.rectOn
+            self.rect = rect
         else :
             group.change_layer(self, BACKGROUND_LAYER)
             self.image = self.surOff
@@ -87,8 +98,3 @@ class Column(pygame.sprite.DirtySprite) :
         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)