[Scummvm-cvs-logs] SF.net SVN: scummvm:[47796] scummvm/trunk/gui
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Mon Feb 1 16:44:24 CET 2010
Revision: 47796
http://scummvm.svn.sourceforge.net/scummvm/?rev=47796&view=rev
Author: m_kiewitz
Date: 2010-02-01 15:44:24 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
partly reverting r46807 ffs. Regression in numpad handling - ID: 2943361
Modified Paths:
--------------
scummvm/trunk/gui/ListWidget.cpp
scummvm/trunk/gui/PopUpWidget.cpp
scummvm/trunk/gui/console.cpp
scummvm/trunk/gui/editable.cpp
Modified: scummvm/trunk/gui/ListWidget.cpp
===================================================================
--- scummvm/trunk/gui/ListWidget.cpp 2010-02-01 13:27:20 UTC (rev 47795)
+++ scummvm/trunk/gui/ListWidget.cpp 2010-02-01 15:44:24 UTC (rev 47796)
@@ -286,7 +286,7 @@
bool dirty = false;
int oldSelectedItem = _selectedItem;
- if (!_editMode && state.keycode <= Common::KEYCODE_z && isprint((unsigned char)state.ascii)) {
+ if (!_editMode && isprint((unsigned char)state.ascii)) {
// Quick selection mode: Go to first list item starting with this key
// (or a substring accumulated from the last couple key presses).
// Only works in a useful fashion if the list entries are sorted.
@@ -351,33 +351,27 @@
}
break;
case Common::KEYCODE_UP:
- case Common::KEYCODE_KP8:
if (_selectedItem > 0)
_selectedItem--;
break;
case Common::KEYCODE_DOWN:
- case Common::KEYCODE_KP2:
if (_selectedItem < (int)_list.size() - 1)
_selectedItem++;
break;
case Common::KEYCODE_PAGEUP:
- case Common::KEYCODE_KP9:
_selectedItem -= _entriesPerPage - 1;
if (_selectedItem < 0)
_selectedItem = 0;
break;
case Common::KEYCODE_PAGEDOWN:
- case Common::KEYCODE_KP3:
_selectedItem += _entriesPerPage - 1;
if (_selectedItem >= (int)_list.size() )
_selectedItem = _list.size() - 1;
break;
case Common::KEYCODE_HOME:
- case Common::KEYCODE_KP7:
_selectedItem = 0;
break;
case Common::KEYCODE_END:
- case Common::KEYCODE_1:
_selectedItem = _list.size() - 1;
break;
default:
Modified: scummvm/trunk/gui/PopUpWidget.cpp
===================================================================
--- scummvm/trunk/gui/PopUpWidget.cpp 2010-02-01 13:27:20 UTC (rev 47795)
+++ scummvm/trunk/gui/PopUpWidget.cpp 2010-02-01 15:44:24 UTC (rev 47796)
@@ -228,19 +228,15 @@
close();
break;
case Common::KEYCODE_UP:
- case Common::KEYCODE_KP8:
moveUp();
break;
case Common::KEYCODE_DOWN:
- case Common::KEYCODE_KP2:
moveDown();
break;
case Common::KEYCODE_HOME:
- case Common::KEYCODE_KP7:
setSelection(0);
break;
case Common::KEYCODE_END:
- case Common::KEYCODE_KP1:
setSelection(_popUpBoss->_entries.size()-1);
break;
default:
Modified: scummvm/trunk/gui/console.cpp
===================================================================
--- scummvm/trunk/gui/console.cpp 2010-02-01 13:27:20 UTC (rev 47795)
+++ scummvm/trunk/gui/console.cpp 2010-02-01 15:44:24 UTC (rev 47796)
@@ -386,21 +386,17 @@
draw();
break;
case Common::KEYCODE_UP:
- case Common::KEYCODE_KP8:
historyScroll(+1);
break;
case Common::KEYCODE_DOWN:
- case Common::KEYCODE_KP2:
historyScroll(-1);
break;
case Common::KEYCODE_RIGHT:
- case Common::KEYCODE_KP6:
if (_currentPos < _promptEndPos)
_currentPos++;
drawLine(pos2line(_currentPos));
break;
case Common::KEYCODE_LEFT:
- case Common::KEYCODE_KP4:
if (_currentPos > _promptStartPos)
_currentPos--;
drawLine(pos2line(_currentPos));
Modified: scummvm/trunk/gui/editable.cpp
===================================================================
--- scummvm/trunk/gui/editable.cpp 2010-02-01 13:27:20 UTC (rev 47795)
+++ scummvm/trunk/gui/editable.cpp 2010-02-01 15:44:24 UTC (rev 47796)
@@ -124,7 +124,6 @@
forcecaret = true;
break;
case Common::KEYCODE_LEFT:
- case Common::KEYCODE_KP4:
if (_caretPos > 0) {
dirty = setCaretPos(_caretPos - 1);
}
@@ -132,7 +131,6 @@
dirty = true;
break;
case Common::KEYCODE_RIGHT:
- case Common::KEYCODE_KP6:
if (_caretPos < (int)_editString.size()) {
dirty = setCaretPos(_caretPos + 1);
}
@@ -140,12 +138,10 @@
dirty = true;
break;
case Common::KEYCODE_HOME:
- case Common::KEYCODE_KP7:
dirty = setCaretPos(0);
forcecaret = true;
break;
case Common::KEYCODE_END:
- case Common::KEYCODE_KP1:
dirty = setCaretPos(_editString.size());
forcecaret = true;
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list