Ajout chanson « Une jolie fleur ». (premier couplet et refrain)

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

diff --git a/src/minwii/widgets/column.py b/src/minwii/widgets/column.py
index 6577296..d829152 100755 (executable)
--- a/src/minwii/widgets/column.py
+++ b/src/minwii/widgets/column.py
@@ -6,21 +6,21 @@ $Id$
 $URL$
 """
 import pygame
 $URL$
 """
 import pygame

-import gradients

 from math import floor
 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 ON_BOTTOM_LUMINANCE
-from config import ON_SATURATION
-from config import ON_COLUMN_OVERSIZING
-from config import ON_COLUMN_ALPHA
-from config import LYRICS_FONT, NOTES_FONT
-from config import FONT_COLOR
-import events
+import minwii.gradients as gradients
+from minwii.globals import BACKGROUND_LAYER
+from minwii.globals import FOREGROUND_LAYER
+from minwii.globals import hls_to_rgba_8bits
+from minwii.config import OFF_LUMINANCE
+from minwii.config import OFF_SATURATION
+from minwii.config import ON_TOP_LUMINANCE
+from minwii.config import ON_BOTTOM_LUMINANCE
+from minwii.config import ON_SATURATION
+from minwii.config import ON_COLUMN_OVERSIZING
+from minwii.config import ON_COLUMN_ALPHA
+from minwii.config import LYRICS_FONT, NOTES_FONT
+from minwii.config import FONT_COLOR
+import minwii.events as events

 
 
 class Column(pygame.sprite.DirtySprite) :
 
 
 class Column(pygame.sprite.DirtySprite) :


@@ -72,9 +72,9 @@ class Column(pygame.sprite.DirtySprite) :
         if state :
             group.change_layer(self, FOREGROUND_LAYER)
             sur = self.surOn
         if state :
             group.change_layer(self, FOREGROUND_LAYER)
             sur = self.surOn

+            rect = self.rectOn

             if syllabus :
                 sur = sur.copy()
             if syllabus :
                 sur = sur.copy()

-                rect = self.rectOn

                 renderedSyl = LYRICS_FONT.render(syllabus, True, FONT_COLOR)
                 sw, sh, = renderedSyl.get_size()
                 w, h = self.rectOn.w, self.rectOn.h
                 renderedSyl = LYRICS_FONT.render(syllabus, True, FONT_COLOR)
                 sw, sh, = renderedSyl.get_size()
                 w, h = self.rectOn.w, self.rectOn.h