From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Tue, 21 Jun 2016 08:31:12 +0000 (+0200)
Subject: Give default color to keys
X-Git-Tag: 1.0.0~88
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git;a=commitdiff_plain;h=d05b1117dfb842959f89797174718ab58d04dd77

Give default color to keys
---

diff --git a/helpers/key.py b/helpers/key.py
index 612758f..56cccaa 100644
--- a/helpers/key.py
+++ b/helpers/key.py
@@ -40,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)