X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fkey.py;h=56cccaa537475836b8120c1a2269e9c5b0fab2c3;hb=d05b1117dfb842959f89797174718ab58d04dd77;hp=e643dc240f030042831000c6a890d85b6bfc961f;hpb=956ce6fd3e47b2536f57f3359ebff26850f30aea;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git

diff --git a/helpers/key.py b/helpers/key.py
index e643dc2..56cccaa 100644
--- a/helpers/key.py
+++ b/helpers/key.py
@@ -6,15 +6,6 @@ import sys
 import pygame
 
 class Key:
-    row_positions = {
-        'first':    0,
-        'second':  50,
-        'third':  100,
-        'fourth': 150,
-        'fifth':  200,
-        'sixth':  250,
-    }
-
     default_outer_color = (120, 120, 120)
     lighter_outer_color = (200, 200, 200)
     default_inner_color = (255, 255, 255)
@@ -27,11 +18,7 @@ class Key:
         self.key_name = key_name
         self.key_sym  = key_sym
 
-        if isinstance(top, str):
-            self.top = self.row_positions[top]
-        else:
-            self.top = top
-
+        self.top = top
         self.left   = left
         self.width  = width
         self.height = height
@@ -41,6 +28,7 @@ class Key:
 
         self.rect     = (self.left, self.top, self.right, self.bottom)
         self.position = (self.left, self.top)
+        self.disabled = disabled
 
         if disabled:
             self.outer_color = self.lighter_outer_color
@@ -52,15 +40,15 @@ class Key:
         self.inner_color = self.default_inner_color
         self.actions = []
         self.description = []
-        self.custom_color = None
-        self.custom_unready_color = None
+        self.custom_color = self.mapped_inner_color
+        self.custom_unready_color = self.mapped_unready_inner_color
 
     def square(self, all_actions_ready):
         if self.has_actions():
             if all_actions_ready:
-                self.inner_color = self.custom_color or self.mapped_inner_color
+                self.inner_color = self.custom_color
             else:
-                self.inner_color = self.custom_unready_color or self.mapped_unready_inner_color
+                self.inner_color = self.custom_unready_color
 
         return RoundedRect((0, 0, self.width, self.height),
             self.outer_color, self.inner_color, self.linewidth)