cosmetique.

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

diff --git a/src/app/widgets/column.py b/src/app/widgets/column.py
index 3d8b986..4e8678b 100755 (executable)
--- a/src/app/widgets/column.py
+++ b/src/app/widgets/column.py
@@ -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, atBorder) :
+    def __init__(self, group, hue, rect, tone) :

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


@@ -51,11 +51,6 @@ 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))

-
-        self.atBorder = atBorder
-        if self.atBorder :
-            setattr(rectOn, self.atBorder, getattr(rect, self.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))


@@ -83,9 +78,13 @@ class Column(pygame.sprite.DirtySprite) :
                 if sw > self.rectOn.w :
                     sur = pygame.transform.scale(sur, (sw, h))
                     rect = rect.inflate(sw - w, 0)
                 if sw > self.rectOn.w :
                     sur = pygame.transform.scale(sur, (sw, h))
                     rect = rect.inflate(sw - w, 0)

-                    if self.atBorder :
-                        setattr(rect, self.atBorder, getattr(self.rectOn, self.atBorder))

                     w = sw
                     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)
 
                 sylRect = pygame.Rect(((w - sw) / 2, (h - sh) / 2), (sw, sh))
                 sur.blit(renderedSyl, sylRect)