[Scummvm-cvs-logs] CVS: scummvm/gui about.cpp,1.20,1.21 about.h,1.5,1.6

[Max Horn]

Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26680

Modified Files:
	about.cpp about.h 
Log Message:
Reduce time till scrolling starts inthe about dialog; pressing shift/alt now causes faster/reverse scrolling (this is an insider trick and not documented on purpose :-)

Index: about.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- about.cpp	23 Dec 2004 19:32:25 -0000	1.20
+++ about.cpp	30 Dec 2004 14:21:15 -0000	1.21
@@ -28,7 +28,7 @@
 namespace GUI {
 
 enum {
-	kScrollStartDelay = 2500,
+	kScrollStartDelay = 1500,
 	kScrollMillisPerPixel = 80,
 	
 	kXOff = 3,
@@ -82,7 +82,7 @@
 
 AboutDialog::AboutDialog()
 	: Dialog(10, 20, 300, 174),
-	_scrollPos(0), _scrollTime(0) {
+	_scrollPos(0), _scrollTime(0), _modifiers(0) {
 	
 	int i;
 	
@@ -194,6 +194,12 @@
 	const uint32 t = g_system->getMillis();
 	int scrollOffset = ((int)t - (int)_scrollTime) / kScrollMillisPerPixel;
 	if (scrollOffset > 0) {
+		// Scroll faster when shift is pressed
+		if (_modifiers & OSystem::KBD_SHIFT)
+			scrollOffset *= 4;
+		// Reverse scrolling when alt is pressed
+		if (_modifiers & OSystem::KBD_ALT)
+			scrollOffset *= -1;
 		_scrollPos += scrollOffset;
 		_scrollTime = t;
 
@@ -215,10 +221,13 @@
 }
 
 void AboutDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
+	_modifiers = modifiers;
 }
 
 void AboutDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) {
-	close();
+	_modifiers = modifiers;
+	if (ascii)
+		close();
 }
 
 

Index: about.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- about.h	19 Dec 2004 19:17:43 -0000	1.5
+++ about.h	30 Dec 2004 14:21:16 -0000	1.6
@@ -33,6 +33,7 @@
 	uint32		_scrollTime;
 	StringList	_lines;
 	uint32		_lineHeight;
+	byte		_modifiers;
 
 public:
 	AboutDialog();