Cleanup fonts

[perso/Immae/Projets/Python/MusicSampler.git] / helpers / key.py

diff --git a/helpers/key.py b/helpers/key.py
index 9a6cb3b29f2a1b0270a1081490eab4efdc90f844..e643dc240f030042831000c6a890d85b6bfc961f 100644 (file)
--- a/helpers/key.py
+++ b/helpers/key.py
@@ -1,5 +1,6 @@
 from .rounded_rect import *
 from .action import *
+from .font import font
 import time
 import sys
 import pygame
@@ -19,7 +20,6 @@ class Key:
     default_inner_color = (255, 255, 255)
     mapped_inner_color  = (  0, 255,   0)
     mapped_unready_inner_color  = (  0, 255,   0, 100)
-    #mapped_unready_inner_color = (255, 165, 0)
 
     def __init__(self, mapping, draw_lock, key_name, key_sym, top, left, width = 48, height = 48, disabled = False):
         self.draw_lock = draw_lock
@@ -72,7 +72,11 @@ class Key:
                 )
 
     def set_description(self, description):
-        self.description = description
+        for desc in description:
+            if desc is None:
+                self.description.append("")
+            else:
+                self.description.append(str(desc))
 
     def set_color(self, color):
         self.custom_color = tuple(color)
@@ -85,19 +89,15 @@ class Key:
 
         self.surface = self.square(all_actions_ready).surface()
 
-        if getattr(sys, 'frozen', False):
-            police = pygame.font.Font(sys._MEIPASS + "/Ubuntu-Regular.ttf", 14)
-            text_police = pygame.font.Font(sys._MEIPASS + "/Ubuntu-Regular.ttf", 10)
-        else:
-            police = pygame.font.Font("Ubuntu-Regular.ttf", 14)
-            text_police = pygame.font.Font("Ubuntu-Regular.ttf", 10)
+        police = font(14)
+        text_police = font(10)
 
         police.set_bold(True)
         text = police.render(self.key_sym, True, (0,0,0))
         self.surface.blit(text, (5,5))
 
         is_first_line = True
-        offset = 11 + text_police.get_linesize()
+        offset = 11 + text_police.get_linesize() - 4
         first_line_offset = 18
         for description in self.description:
             text = text_police.render(description, True, (0,0,0))
@@ -105,8 +105,8 @@ class Key:
                 self.surface.blit(text, (first_line_offset, 9))
                 is_first_line = False
             else:
-                self.surface.blit(text, (5, offset))
-                offset += text_police.get_linesize()
+                self.surface.blit(text, (3, offset))
+                offset += text_police.get_linesize() - 4
 
         background_surface.blit(self.surface, self.position)
         self.draw_lock.release()
@@ -145,12 +145,9 @@ class Key:
         #print("actions linked to key {}:".format(self.key_sym))
         #print("\t" + "\n\t".join(action_descriptions))
         self.draw_lock.acquire()
-        surface = pygame.Surface((800, 250)).convert()
+        surface = pygame.Surface((690, 250)).convert()
         surface.fill((250, 250, 250))
-        if getattr(sys, 'frozen', False):
-            police = pygame.font.Font(sys._MEIPASS + "/Ubuntu-Regular.ttf", 14)
-        else:
-            police = pygame.font.Font("Ubuntu-Regular.ttf", 14)
+        police = font(14)
 
         offset = 0
         police.set_bold(True)
@@ -164,7 +161,7 @@ class Key:
             surface.blit(text, (0, offset))
             offset += police.get_linesize()
 
-        screen.blit(surface, (10, 330))
+        screen.blit(surface, (5, 308))
         pygame.display.flip()
         self.draw_lock.release()