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

[Max Horn]

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

Modified Files:
	about.cpp about.h 
Log Message:
Final part of the fix for bug #1091802 (GUI: Credits scroll glitch)

Index: about.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- about.cpp	30 Dec 2004 14:21:15 -0000	1.21
+++ about.cpp	30 Dec 2004 14:55:20 -0000	1.22
@@ -82,7 +82,7 @@
 
 AboutDialog::AboutDialog()
 	: Dialog(10, 20, 300, 174),
-	_scrollPos(0), _scrollTime(0), _modifiers(0) {
+	_scrollPos(0), _scrollTime(0), _modifiers(0), _willClose(false) {
 	
 	int i;
 	
@@ -116,6 +116,8 @@
 void AboutDialog::open() {
 	_scrollTime = g_system->getMillis() + kScrollStartDelay;
 	_scrollPos = 0;
+	_modifiers = 0;
+	_willClose = false;
 
 	Dialog::open();
 }
@@ -222,11 +224,13 @@
 
 void AboutDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
 	_modifiers = modifiers;
+	if (ascii)
+		_willClose = true;
 }
 
 void AboutDialog::handleKeyUp(uint16 ascii, int keycode, int modifiers) {
 	_modifiers = modifiers;
-	if (ascii)
+	if (ascii && _willClose)
 		close();
 }
 

Index: about.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/about.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- about.h	30 Dec 2004 14:21:16 -0000	1.6
+++ about.h	30 Dec 2004 14:55:20 -0000	1.7
@@ -34,6 +34,7 @@
 	StringList	_lines;
 	uint32		_lineHeight;
 	byte		_modifiers;
+	bool		_willClose;
 
 public:
 	AboutDialog();