Added the notion of a 'cancel' button, and unified all the 'cancel' menu IDs to be kCancelMenuID (ie -1). I've slaved the Menu button (ie Esc on win, 'Start' button on PSP) to this - the idea being, if you hit the Menu button to bring up a menu, hitting it again will dismiss it without doing anything, which is pretty standard behavior for most console/computer games.

This commit is contained in:
wrenczes@gmail.com
2010-11-07 02:08:17 +00:00
parent b0c61049da
commit 3c19533a4c
13 changed files with 303 additions and 274 deletions

View File

@@ -1649,7 +1649,7 @@ void WGuiFilterItem::updateValue(){
}
if(!mNew)
mParent->subMenu->Add(-2,"Remove");
mParent->subMenu->Add(-1,"Cancel");
mParent->subMenu->Add(kCancelMenuID,"Cancel");
if(delMenu){
SAFE_DELETE(mParent->subMenu);
mState = STATE_FINISHED;
@@ -1754,7 +1754,7 @@ void WGuiFilterItem::updateValue(){
}
mParent->addArg("Digit","alpha:#;");
}
mParent->subMenu->Add(-1,"Cancel");
mParent->subMenu->Add(kCancelMenuID,"Cancel");
break;
case STATE_CHOOSE_VAL:
mState = STATE_FINISHED;