Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jeck - Fix for two obscure edge case bugs in the options menu.

Browse Source 
* Confirmable options used to only check for confirmation when selecting another option. They now autoconfirm when saving & exiting. This bug could possibly result in loading the wrong theme. Fixed.
 * Changing profiles, canceling, then changing to the profile again could also result in improper theme loading. Fixed.
This commit is contained in:
wagic.jeck
2009-10-21 02:34:29 +00:00
parent 63ddbd52ad
commit 6d62c013df
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
projects/mtg/src/OptionItem.cpp
View File

@@ -174,8 +174,8 @@ OptionProfile::OptionProfile(GameApp * _app, JGuiListener * jgl): OptionDirector
addSelection("Default");
sort(selections.begin(),selections.end());
mFocus = false;
populate();
initSelections();
populate();
};
void OptionProfile::addSelection(string s){
@@ -201,12 +201,10 @@ void OptionProfile::Reload(){
populate();
}
void OptionProfile::populate(){
string temp = options[Options::ACTIVE_PROFILE].str;
if (value >= selections.size()){ //TODO fail gracefully.
return;
}
options[Options::ACTIVE_PROFILE].str = selections[value];
PlayerData * pdata = NEW PlayerData(app->collection);
options[Options::ACTIVE_PROFILE] = temp;
@@ -267,15 +265,17 @@ void OptionProfile::confirmChange(bool confirmed){
int result;
if(confirmed) result = value;
else result = initialValue;
if(confirmed) result = value;
else result = initialValue;
options[Options::ACTIVE_PROFILE] = selections[result];
value = result;
populate();
if(listener && confirmed)
if(listener && confirmed){
listener->ButtonPressed(-102,5);
initialValue = value;
}
return;
}
@@ -416,6 +416,11 @@ void WGuiList::renderBack(WGuiBase * it){
}
}
void WGuiList::confirmChange(bool confirmed){
for(int x=0;x<nbitems;x++){
listItems[x]->confirmChange(confirmed);
}
}
void WGuiList::Render(){
JRenderer * renderer = JRenderer::GetInstance();
int listHeight=40;
@@ -685,8 +690,8 @@ void OptionTheme::confirmChange(bool confirmed){
value = prior_value;
else{
setData();
prior_value = value;
resources.Refresh(); //Update images
prior_value = value;
}
}
string WDecoEnum::lookupVal(int value){
@@ -1031,10 +1036,8 @@ void WGuiSplit::Reload(){
right->Reload();
}
void WGuiSplit::confirmChange(bool confirmed){
if(bRight)
right->confirmChange(confirmed);
else
left->confirmChange(confirmed);
right->confirmChange(confirmed);
left->confirmChange(confirmed);
}
//WGuiMenu