From 40df0291f9bad08da9ee6c5fc0457899bd52b7ac Mon Sep 17 00:00:00 2001 From: pin Date: Fri, 9 Apr 2010 11:25:48 +0000 Subject: [PATCH] Utilisation de deux polices : Arial Unicode pas top pour les paroles. git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@133 fe552daf-6dbe-4428-90eb-1537e0879342 --- src/app/config.py | 3 ++- src/app/widgets/column.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/config.py b/src/app/config.py index 2de1b90..eb10ceb 100755 --- a/src/app/config.py +++ b/src/app/config.py @@ -32,7 +32,8 @@ ON_SATURATION = 1 ON_COLUMN_OVERSIZING = 2 ON_COLUMN_ALPHA = 1 font_file = _computePath('fonts/Arial Unicode.ttf') -FONT = pygame.font.Font(font_file, 50) +NOTES_FONT = pygame.font.Font(font_file, 50) +LYRICS_FONT = pygame.font.Font(None, 80) FONT_COLOR = (0,0,0) DEFAULT_MIDI_VELOCITY = 96 diff --git a/src/app/widgets/column.py b/src/app/widgets/column.py index 4e8678b..94fddcc 100755 --- a/src/app/widgets/column.py +++ b/src/app/widgets/column.py @@ -18,7 +18,7 @@ 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 FONT +from config import LYRICS_FONT, NOTES_FONT from config import FONT_COLOR @@ -30,7 +30,7 @@ class Column(pygame.sprite.DirtySprite) : # 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) @@ -71,7 +71,7 @@ class Column(pygame.sprite.DirtySprite) : if syllabus : sur = sur.copy() rect = self.rectOn - renderedSyl = FONT.render(syllabus, True, FONT_COLOR) + renderedSyl = LYRICS_FONT.render(syllabus, True, FONT_COLOR) sw, sh, = renderedSyl.get_size() w, h = self.rectOn.w, self.rectOn.h -- 2.20.1