projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Those did nothing
[naja.git]
/
naja
/
widgets
/
selector.py
diff --git
a/naja/widgets/selector.py
b/naja/widgets/selector.py
index 49cf8d8715048a8371d943c605b112944a6d4371..dcbc74498b930b3e4d2b31aa6318eae7d59d6b57 100644
(file)
--- a/
naja/widgets/selector.py
+++ b/
naja/widgets/selector.py
@@
-1,8
+1,10
@@
import pygame.locals as pgl
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 EIGHT_BIT, R270
from naja.widgets.base import Container
from naja.resources import resources
from naja.resources.mutators import EIGHT_BIT, R270
+from naja.sound import sound
class SelectorWidget(Container):
class SelectorWidget(Container):
@@
-16,21
+18,29
@@
class SelectorWidget(Container):
super(SelectorWidget, self).render(surface)
pos = self.selector.get_rect()
selected = self.widgets[self.position]
super(SelectorWidget, self).render(surface)
pos = self.selector.get_rect()
selected = self.widgets[self.position]
+ if not selected.is_selectable():
+ selected = self.change_pos(1)
+
pos = pos.move(selected.pos)
pos = pos.move(-pos.width * 1.5, (selected.size[1] - pos.height) / 2)
surface.blit(self.selector, pos)
pos = pos.move(selected.pos)
pos = pos.move(-pos.width * 1.5, (selected.size[1] - pos.height) / 2)
surface.blit(self.selector, pos)
+ def change_pos(self, change):
+ self.position = (self.position + change) % len(self.widgets)
+ while not self.widgets[self.position].is_selectable():
+ self.position = (self.position + change) % len(self.widgets)
+ return self.widgets[self.position]
+
def handle_event(self, ev):
if ev.type == pgl.KEYDOWN:
def handle_event(self, ev):
if ev.type == pgl.KEYDOWN:
- if ev.key in (pgl.K_DOWN, pgl.K_s, pgl.K_o,
- pgl.K_UP, pgl.K_w, pgl.K_COMMA):
- if ev.key in (pgl.K_DOWN, pgl.K_s, pgl.K_o):
- self.position += 1
+ if ev.key in KEYS.UP + KEYS.DOWN:
+ if ev.key in KEYS.DOWN:
+ self.change_pos(1)
else:
else:
- self.
position -= 1
- s
elf.position %= len(self.widgets
)
+ self.
change_pos(-1)
+ s
ound.play_sound('zoop.ogg', volume=0.05
)
return True
return True
- elif ev.key in
(pgl.K_RETURN, pgl.K_KP_ENTER)
:
+ elif ev.key in
KEYS.SELECT
:
return self.widgets[self.position].callback('click')
return super(SelectorWidget, self).handle_event(ev)
return self.widgets[self.position].callback('click')
return super(SelectorWidget, self).handle_event(ev)