aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2006-12-26 20:57:29 +0000
committerEugene Sandulenko2006-12-26 20:57:29 +0000
commita0f5e6f0b17367ae80dfc0e95c24c96bd9caf3bd (patch)
treef2eddd32031306651a8c8e3d944c119e97224e48
parent83ba0cfc8eddf22c302747fc8a7ab4038a569587 (diff)
downloadscummvm-rg350-a0f5e6f0b17367ae80dfc0e95c24c96bd9caf3bd.tar.gz
scummvm-rg350-a0f5e6f0b17367ae80dfc0e95c24c96bd9caf3bd.tar.bz2
scummvm-rg350-a0f5e6f0b17367ae80dfc0e95c24c96bd9caf3bd.zip
Patch #1622564: "Enhanced PopUp behaviour"
svn-id: r24931
-rw-r--r--gui/PopUpWidget.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/gui/PopUpWidget.cpp b/gui/PopUpWidget.cpp
index 0a161bedcc..19084974b8 100644
--- a/gui/PopUpWidget.cpp
+++ b/gui/PopUpWidget.cpp
@@ -193,8 +193,10 @@ void PopUpDialog::handleMouseMoved(int x, int y, int button) {
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::handleMouseMoved(int x, int y, int button) {
void PopUpDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
if (keycode == 27) { // escape
+ // Don't change the previous selection
+ setResult(-1);
close();
return;
}