X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fwidgets%2Fselector.py;h=c5ba07f37a4eb490010155d5b334f0e82c26ed14;hb=0cef06f581d48315a59a19ac06ca1d2be14cbb4c;hp=c0c91b96e8ec584fbc76e437c5605d70dd11a568;hpb=2a9f5c76556f00f631ea10a6cba44a92bdd27512;p=naja.git diff --git a/naja/widgets/selector.py b/naja/widgets/selector.py index c0c91b9..c5ba07f 100644 --- a/naja/widgets/selector.py +++ b/naja/widgets/selector.py @@ -1,8 +1,9 @@ import pygame.locals as pgl +from naja.constants import KEYS from naja.widgets.base import Container from naja.resources import resources -from naja.resources.mutators import R270 +from naja.resources.mutators import EIGHT_BIT, R270 class SelectorWidget(Container): @@ -10,7 +11,7 @@ class SelectorWidget(Container): super(SelectorWidget, self).__init__(*args, **kwargs) self.position = 0 self.selector = resources.get_image('bits', 'arrow_on.png', - transforms=(R270,)) + transforms=(R270, EIGHT_BIT)) def render(self, surface): super(SelectorWidget, self).render(surface) @@ -22,14 +23,14 @@ class SelectorWidget(Container): def handle_event(self, ev): if ev.type == pgl.KEYDOWN: - if ev.key in (pgl.K_DOWN, pgl.K_UP): - if ev.key == pgl.K_DOWN: + if ev.key in KEYS.UP + KEYS.DOWN: + if ev.key in KEYS.DOWN: self.position += 1 else: self.position -= 1 self.position %= len(self.widgets) return True - elif ev.key == pgl.K_RETURN: + elif ev.key in KEYS.SELECT: return self.widgets[self.position].callback('click') return super(SelectorWidget, self).handle_event(ev)