From: pin Date: Wed, 24 Feb 2010 10:34:37 +0000 (+0000) Subject: Utilisation de LayeredUpdates pour maj dans le bon ordre. X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/commitdiff_plain/a5fce1a57c3a50012db8d914b4d36851e048ad67 Utilisation de LayeredUpdates pour maj dans le bon ordre. git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@57 fe552daf-6dbe-4428-90eb-1537e0879342 --- diff --git a/src/app/widgets/playingscreen.py b/src/app/widgets/playingscreen.py index cf4b0ae..9558770 100755 --- a/src/app/widgets/playingscreen.py +++ b/src/app/widgets/playingscreen.py @@ -22,10 +22,10 @@ OFF_SATURATION = 1 ON_TOP_LUMINANCE = 0.6 ON_BOTTOM_LUMINANCE = 0.9 ON_SATURATION = 1 -ON_COLUMN_OVERSIZING = 2 +ON_COLUMN_OVERSIZING = 1.75 -class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) : +class _PlayingScreenBase(pygame.sprite.LayeredUpdates, EventHandlerMixin) : def __init__(self, distinctNotes=[]) : """ @@ -77,11 +77,11 @@ class _PlayingScreenBase(pygame.sprite.OrderedUpdates, EventHandlerMixin) : for i, rect in enumerate(self.keyboardRects) : hue = FIRST_HUE - hueStep * i c = Column(hue, rect) - self.add(c) + self.add(c, layer=0) def _initCursor(self) : self.cursor = WarpingCursor(blinkMode=True) - self.add(self.cursor) + self.add(self.cursor, layer=2) def highlightColumn(self, index) : @@ -141,8 +141,10 @@ class Column(pygame.sprite.Sprite, EventHandlerMixin) : topRgba = hls_to_rgba_8bits(hue, ON_TOP_LUMINANCE, ON_SATURATION) bottomRgba = hls_to_rgba_8bits(hue, ON_BOTTOM_LUMINANCE, ON_SATURATION) - rectOn = pygame.Rect((rect.left - rect.width/2, 0), - (rect.width * ON_COLUMN_OVERSIZING, rect.height)) + onWidth = rect.width * ON_COLUMN_OVERSIZING + onLeft = rect.centerx - onWidth / 2 + rectOn = pygame.Rect((onLeft, 0), + (onWidth, rect.height)) self.stateOn = gradients.vertical(rectOn.size, topRgba, bottomRgba) self.rectOn = rectOn @@ -150,10 +152,13 @@ class Column(pygame.sprite.Sprite, EventHandlerMixin) : self.rect = rect def update(self, state) : + group = self.groups()[0] if state : + group.change_layer(self, 1) self.image = self.stateOn self.rect = self.rectOn else : + group.change_layer(self, 0) self.image = self.stateOff self.rect = self.rectOff