Add cross when key is not usable

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

diff --git a/helpers/key.py b/helpers/key.py
index 2f941532256ff89d97b688fe0a70582c6e813e35..2b9d1520e8549a5f6f4f6aa43a369f45df078d20 100644 (file)
--- a/helpers/key.py
+++ b/helpers/key.py
@@ -107,6 +107,20 @@ class Key(ButtonBehavior, Widget):
     description = ListProperty([])
     state = StringProperty("")
 
+    def get_alias_line_cross_color(self):
+        if self.is_loaded_running() or self.is_loaded_protecting_repeat():
+            return [120/255, 120/255, 120/255, 1]
+        else:
+            return [0, 0, 0, 0]
+
+    def set_alias_line_cross_color(self):
+        pass
+
+    line_cross_color = AliasProperty(
+            get_alias_line_cross_color,
+            set_alias_line_cross_color,
+            bind=['state'])
+
     def get_alias_line_color(self):
         if self.is_loaded_running():
             return [0, 0, 0, 1]
@@ -124,6 +138,8 @@ class Key(ButtonBehavior, Widget):
             return [1, 1, 1, 1]
         elif self.is_loaded_protecting_repeat():
             return [*self.custom_color, 100/255]
+        elif self.is_loaded_running():
+            return [*self.custom_color, 100/255]
         elif self.is_loaded(allow_substates=True):
             return [*self.custom_color, 1]
         elif self.is_failed():
@@ -191,7 +207,7 @@ class Key(ButtonBehavior, Widget):
         for self.current_action in self.actions:
             if self.parent.keep_running(self, start_time):
                 self.list_actions()
-                self.current_action.run()
+                self.current_action.run(start_time)
         self.list_actions(last_action_finished=True)
 
         self.parent.finished_running(self, start_time)