Added music name, currently playing musics, pause/unpause

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

diff --git a/helpers/key.py b/helpers/key.py
index 9a6cb3b29f2a1b0270a1081490eab4efdc90f844..57fdef1d5616eb9df83ddf0bf0c18d9fb592d2dc 100644 (file)
--- a/helpers/key.py
+++ b/helpers/key.py
@@ -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)
@@ -97,7 +101,7 @@ class Key:
         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 +109,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,7 +149,7 @@ 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)
@@ -164,7 +168,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()