[Scummvm-cvs-logs] SF.net SVN: scummvm: [24931] scummvm/trunk/gui/PopUpWidget.cpp

[sev at users.sourceforge.net]

Revision: 24931
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24931&view=rev
Author:   sev
Date:     2006-12-26 12:57:29 -0800 (Tue, 26 Dec 2006)

Log Message:
-----------
Patch #1622564: "Enhanced PopUp behaviour"

Modified Paths:
--------------
    scummvm/trunk/gui/PopUpWidget.cpp

Modified: scummvm/trunk/gui/PopUpWidget.cpp
===================================================================
--- scummvm/trunk/gui/PopUpWidget.cpp	2006-12-26 20:16:48 UTC (rev 24930)
+++ scummvm/trunk/gui/PopUpWidget.cpp	2006-12-26 20:57:29 UTC (rev 24931)
@@ -193,8 +193,10 @@
 	if (item >= 0 && _popUpBoss->_entries[item].name.size() == 0)
 		item = -1;
 
-	if (item == -1 && !isMouseDown())
+	if (item == -1 && !isMouseDown()) {
+		setSelection(_popUpBoss->_selectedItem);
 		return;
+	}
 
 	// ...and update the selection accordingly
 	setSelection(item);
@@ -202,6 +204,8 @@
 
 void PopUpDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
 	if (keycode == 27) {	// escape
+		// Don't change the previous selection
+		setResult(-1);
 		close();
 		return;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.