]> git.immae.eu Git - perso/Immae/Projets/Python/MusicSampler.git/commitdiff
Give default color to keys
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Tue, 21 Jun 2016 08:31:12 +0000 (10:31 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Tue, 21 Jun 2016 08:31:12 +0000 (10:31 +0200)
helpers/key.py

index 612758f5e4f01f7e489ce7b01f64ca5cec573652..56cccaa537475836b8120c1a2269e9c5b0fab2c3 100644 (file)
@@ -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)