projects
/
minwii.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
démarrage du support de plusieurs wiimotes.
[minwii.git]
/
src
/
app
/
widgets
/
column.py
diff --git
a/src/app/widgets/column.py
b/src/app/widgets/column.py
index
e55b935
..
94fddcc
100755
(executable)
--- a/
src/app/widgets/column.py
+++ b/
src/app/widgets/column.py
@@
-18,19
+18,19
@@
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 ON_SATURATION
from config import ON_COLUMN_OVERSIZING
from config import ON_COLUMN_ALPHA
-from config import FONT
+from config import
LYRICS_FONT, NOTES_
FONT
from config import FONT_COLOR
class Column(pygame.sprite.DirtySprite) :
from config import FONT_COLOR
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
# nom de l'intonation
self.tone = tone
pygame.sprite.DirtySprite.__init__(self, group)
self.state = False
# nom de l'intonation
self.tone = tone
- toneName = FONT.render(tone.nom, True, FONT_COLOR)
+ toneName =
NOTES_
FONT.render(tone.nom, True, FONT_COLOR)
# état off : surface unie et nom de l'intonation
sur = pygame.surface.Surface(rect.size)
# état off : surface unie et nom de l'intonation
sur = pygame.surface.Surface(rect.size)
@@
-51,9
+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))
- 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))
@@
-73,14
+70,27
@@
class Column(pygame.sprite.DirtySprite) :
sur = self.surOn
if syllabus :
sur = sur.copy()
sur = self.surOn
if syllabus :
sur = sur.copy()
- renderedSyl = FONT.render(syllabus, True, FONT_COLOR)
+ rect = self.rectOn
+ renderedSyl = LYRICS_FONT.render(syllabus, True, FONT_COLOR)
sw, sh, = renderedSyl.get_size()
w, h = self.rectOn.w, self.rectOn.h
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
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
else :
group.change_layer(self, BACKGROUND_LAYER)
self.image = self.surOff