X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=helpers%2Fkey.py;h=56cccaa537475836b8120c1a2269e9c5b0fab2c3;hb=d05b1117dfb842959f89797174718ab58d04dd77;hp=612758f5e4f01f7e489ce7b01f64ca5cec573652;hpb=fba0caf0417cbb4e5b370e16e4b0c855c74094c1;p=perso%2FImmae%2FProjets%2FPython%2FMusicSampler.git 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)