Mercurial > mamba

changeset 417:737e19e79857

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Also allow KP_ENTER
author Stefano Rivera <stefano@rivera.za.net>
date Sat, 17 Sep 2011 16:49:31 +0200
parents 30ce046d08c3
children 546b68aedf0c
files mamba/widgets/base.py mamba/widgets/entrybox.py mamba/widgets/text.py
diffstat 3 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mamba/widgets/base.py	Sat Sep 17 16:40:29 2011 +0200
+++ b/mamba/widgets/base.py	Sat Sep 17 16:49:31 2011 +0200
@@ -1,9 +1,9 @@
 import collections
 
 import pygame
-from pygame.constants import K_UP, K_DOWN, K_LEFT, K_RIGHT, K_RETURN, SRCALPHA
-from pygame.locals import (KEYDOWN, MOUSEMOTION, MOUSEBUTTONUP,
-                           MOUSEBUTTONDOWN, USEREVENT)
+from pygame.locals import (KEYDOWN, K_DOWN, K_LEFT, K_RETURN, K_RIGHT, K_UP,
+                           K_KP_ENTER, MOUSEBUTTONDOWN, MOUSEBUTTONUP,
+                           MOUSEMOTION, SRCALPHA, USEREVENT)
 
 from mamba.constants import UP, DOWN, LEFT, RIGHT
 from mamba.engine import UserEvent
@@ -83,7 +83,7 @@
         if super(Button, self).event(ev):
             return True
         if (ev.type == MOUSEBUTTONDOWN
-                or (ev.type == KEYDOWN and ev.key == K_RETURN)):
+                or (ev.type == KEYDOWN and ev.key in (K_RETURN, K_KP_ENTER))):
             for callback, args in self.callbacks['clicked']:
                 if callback(ev, self, *args):
                     return True
--- a/mamba/widgets/entrybox.py	Sat Sep 17 16:40:29 2011 +0200
+++ b/mamba/widgets/entrybox.py	Sat Sep 17 16:49:31 2011 +0200
@@ -1,4 +1,4 @@
-from pygame.constants import K_ESCAPE, K_RETURN, KEYDOWN
+from pygame.constants import K_ESCAPE, K_RETURN, K_KP_ENTER, KEYDOWN
 
 from mamba.widgets.base import Box
 from mamba.widgets.text import TextWidget, TextButton, EntryTextWidget
@@ -57,7 +57,7 @@
         if ev.key == K_ESCAPE:
             self.close(ev, widget, False)
             return True
-        elif ev.key == K_RETURN:
+        elif ev.key in (K_RETURN, K_KP_ENTER):
             self.close(ev, widget, True)
             return True
         return False  # pass this up to parent
--- a/mamba/widgets/text.py	Sat Sep 17 16:40:29 2011 +0200
+++ b/mamba/widgets/text.py	Sat Sep 17 16:49:31 2011 +0200
@@ -1,6 +1,6 @@
 import pygame
 from pygame.constants import (SRCALPHA, KEYDOWN, K_ESCAPE, K_RETURN, K_UP,
-        K_DOWN)
+        K_DOWN, K_KP_ENTER)
 
 from mamba.constants import COLOR, FONT_SIZE, FOCUS_COLOR, DELETE_KEYS
 from mamba.widgets.base import Widget, Button
@@ -87,7 +87,7 @@
         if ev.key in DELETE_KEYS:
             if self.value:
                 self.value = self.value[:-1]
-        elif ev.key in (K_ESCAPE, K_RETURN, K_UP, K_DOWN):
+        elif ev.key in (K_ESCAPE, K_RETURN, K_KP_ENTER, K_UP, K_DOWN):
             return False  # ignore these
         else:
             self.value += ev.unicode