From: pin <pin@fe552daf-6dbe-4428-90eb-1537e0879342>
Date: Tue, 12 Jul 2011 11:27:55 +0000 (+0000)
Subject: bugfix : on ne testait pas correctement la touche échap.
X-Git-Url: https://scm.cri.mines-paristech.fr/git/minwii.git/commitdiff_plain/21cc59e0782f77420330a2b108c6708ea2edade0?hp=ae79067c99dcb4473df80ddd5eb24395d90ab6d3

bugfix : on ne testait pas correctement la touche échap.


git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@375 fe552daf-6dbe-4428-90eb-1537e0879342
---

diff --git a/src/minwii/widgets/instrumentselector.py b/src/minwii/widgets/instrumentselector.py
index 403f3bc..52799d0 100755
--- a/src/minwii/widgets/instrumentselector.py
+++ b/src/minwii/widgets/instrumentselector.py
@@ -72,9 +72,8 @@ class InstrumentSelector(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
-        if event.key == pygame.K_q or \
-            event.unicode == u'q' or \
-            pygame.K_ESCAPE:
+        if event.key in (pygame.K_q, pygame.K_ESCAPE) or \
+            event.unicode == u'q' :
             self.stop()
 
     @event_handler(pygame.MOUSEMOTION)
diff --git a/src/minwii/widgets/playingscreen.py b/src/minwii/widgets/playingscreen.py
index 6d66ace..e88047d 100755
--- a/src/minwii/widgets/playingscreen.py
+++ b/src/minwii/widgets/playingscreen.py
@@ -106,9 +106,8 @@ class PlayingScreenBase(pygame.sprite.LayeredDirty, EventHandlerMixin) :
 
     @event_handler(pygame.KEYDOWN)       
     def handleKeyDown(self, event) :
-        if event.key == pygame.K_q or \
-            event.unicode == u'q' or \
-            pygame.K_ESCAPE:
+        if event.key in (pygame.K_q, pygame.K_ESCAPE) or \
+            event.unicode == u'q' :
             self.stop()
     
     @event_handler(pygame.MOUSEBUTTONDOWN)