[Scummvm-cvs-logs] CVS: scummvm/gui ListWidget.cpp,1.15,1.16 EditTextWidget.cpp,1.3,1.4
Max Horn
fingolfin at users.sourceforge.net
Thu Nov 21 09:25:07 CET 2002
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1:/tmp/cvs-serv29708
Modified Files:
ListWidget.cpp EditTextWidget.cpp
Log Message:
allow some more chars as input
Index: ListWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ListWidget.cpp 21 Nov 2002 15:20:51 -0000 1.15
+++ ListWidget.cpp 21 Nov 2002 17:24:42 -0000 1.16
@@ -147,31 +147,32 @@
if (_caretVisible)
drawCaret(true);
- if (key == '\n' || key == '\r') {
- // enter, confirm edit and exit editmode
- _editMode = false;
- dirty = true;
- sendCommand(kListItemActivatedCmd, _selectedItem);
- } else if (key == 27) {
- // ESC, abort edit and exit editmode
- _editMode = false;
- dirty = true;
- _list[_selectedItem] = _backupString;
- } else if (key == 8) { // backspace
- _list[_selectedItem].deleteLastChar();
- dirty = true;
- } else if (// filter keystrokes
- ( ( key >= 'a' && key <= 'z' )
- || ( key >= 'A' && key <= 'Z' )
- || ( key >= '0' && key <= '9' )
- || ( key == ' ')
- ) )
- {
-
- _list[_selectedItem] += key;
- dirty = true;
- } else
- handled = false;
+ switch (key) {
+ case '\n': // enter/return
+ case '\r':
+ // enter, confirm edit and exit editmode
+ _editMode = false;
+ dirty = true;
+ sendCommand(kListItemActivatedCmd, _selectedItem);
+ break;
+ case 27: // escape
+ // ESC, abort edit and exit editmode
+ _editMode = false;
+ dirty = true;
+ _list[_selectedItem] = _backupString;
+ break;
+ case 8: // backspace
+ _list[_selectedItem].deleteLastChar();
+ dirty = true;
+ break;
+ default:
+ if (isalnum(key) || key == ' ' || key == '-' || key == '_') {
+ _list[_selectedItem] += key;
+ dirty = true;
+ } else {
+ handled = false;
+ }
+ }
} else {
// not editmode
Index: EditTextWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/EditTextWidget.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- EditTextWidget.cpp 21 Nov 2002 17:05:50 -0000 1.3
+++ EditTextWidget.cpp 21 Nov 2002 17:24:42 -0000 1.4
@@ -87,7 +87,7 @@
case 23: // end
break;
default:
- if (isalnum(key) || key == ' ') {
+ if (isalnum(key) || key == ' ' || key == '-' || key == '_') {
_label += key;
dirty = true;
} else {
More information about the Scummvm-git-logs
mailing list