The-Homebrew-Cloud/fceugx
2
0
Fork 0
mirror of https://github.com/dborth/fceugx.git synced 2024-11-01 06:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Go Back is no longer the first item highlighted for Settings

Browse Source
This commit is contained in:
Daryl Borth 2018-08-26 20:56:17 -06:00
parent 1c2aeb0878
commit 3e07d0cfe3
1 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
source/menu.cpp
View File

@ -3251,7 +3251,11 @@ static int MenuSettingsVideo()
static int MenuSettings() static int MenuSettings()
{ {
int menu = MENU_NONE; int menu = MENU_NONE;
char s[10]; char gameGenieTxt[10];
if(!FindGameGenie()) sprintf(gameGenieTxt, "DISABLED");
else if(GCSettings.gamegenie) sprintf(gameGenieTxt, "ON");
else sprintf(gameGenieTxt, "OFF");
GuiText titleTxt("Settings", 26, (GXColor){255, 255, 255, 255}); GuiText titleTxt("Settings", 26, (GXColor){255, 255, 255, 255});
titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP); titleTxt.SetAlignment(ALIGN_LEFT, ALIGN_TOP);
@ -3268,44 +3272,6 @@ static int MenuSettings()
GuiImageData iconNetwork(icon_settings_network_png); GuiImageData iconNetwork(icon_settings_network_png);
GuiImageData iconCheats(icon_game_cheats_png); GuiImageData iconCheats(icon_game_cheats_png);
GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255});
GuiImage backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
backBtn.SetPosition(90, -35);
backBtn.SetLabel(&backBtnTxt);
backBtn.SetImage(&backBtnImg);
backBtn.SetImageOver(&backBtnImgOver);
backBtn.SetSoundOver(&btnSoundOver);
backBtn.SetSoundClick(&btnSoundClick);
backBtn.SetTrigger(trigA);
backBtn.SetTrigger(trig2);
backBtn.SetEffectGrow();
GuiText resetBtnTxt("Reset Settings", 22, (GXColor){0, 0, 0, 255});
GuiImage resetBtnImg(&btnOutline);
GuiImage resetBtnImgOver(&btnOutlineOver);
GuiButton resetBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
resetBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM);
resetBtn.SetPosition(-90, -35);
resetBtn.SetLabel(&resetBtnTxt);
resetBtn.SetImage(&resetBtnImg);
resetBtn.SetImageOver(&resetBtnImgOver);
resetBtn.SetSoundOver(&btnSoundOver);
resetBtn.SetSoundClick(&btnSoundClick);
resetBtn.SetTrigger(trigA);
resetBtn.SetTrigger(trig2);
resetBtn.SetEffectGrow();
HaltGui();
GuiWindow w(screenwidth, screenheight);
w.Append(&titleTxt);
w.Append(&backBtn);
w.Append(&resetBtn);
mainWindow->Append(&w);
ResumeGui();
GuiText savingBtnTxt1("Saving", 22, (GXColor){0, 0, 0, 255}); GuiText savingBtnTxt1("Saving", 22, (GXColor){0, 0, 0, 255});
GuiText savingBtnTxt2("&", 18, (GXColor){0, 0, 0, 255}); GuiText savingBtnTxt2("&", 18, (GXColor){0, 0, 0, 255});
GuiText savingBtnTxt3("Loading", 22, (GXColor){0, 0, 0, 255}); GuiText savingBtnTxt3("Loading", 22, (GXColor){0, 0, 0, 255});
@ -3365,11 +3331,8 @@ static int MenuSettings()
networkBtn.SetTrigger(trig2); networkBtn.SetTrigger(trig2);
networkBtn.SetEffectGrow(); networkBtn.SetEffectGrow();
if(!FindGameGenie()) sprintf(s, "DISABLED");
else if(GCSettings.gamegenie) sprintf(s, "ON");
else sprintf(s, "OFF");
GuiText cheatsBtnTxt("Game Genie", 22, (GXColor){0, 0, 0, 255}); GuiText cheatsBtnTxt("Game Genie", 22, (GXColor){0, 0, 0, 255});
GuiText cheatsBtnTxt2(s, 18, (GXColor){0, 0, 0, 255}); GuiText cheatsBtnTxt2(gameGenieTxt, 18, (GXColor){0, 0, 0, 255});
cheatsBtnTxt.SetPosition(0, -16); cheatsBtnTxt.SetPosition(0, -16);
cheatsBtnTxt2.SetPosition(0, +8); cheatsBtnTxt2.SetPosition(0, +8);
GuiImage cheatsBtnImg(&btnLargeOutline); GuiImage cheatsBtnImg(&btnLargeOutline);
@ -3389,12 +3352,47 @@ static int MenuSettings()
cheatsBtn.SetTrigger(trig2); cheatsBtn.SetTrigger(trig2);
cheatsBtn.SetEffectGrow(); cheatsBtn.SetEffectGrow();
HaltGui(); GuiText backBtnTxt("Go Back", 22, (GXColor){0, 0, 0, 255});
GuiImage backBtnImg(&btnOutline);
GuiImage backBtnImgOver(&btnOutlineOver);
GuiButton backBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
backBtn.SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
backBtn.SetPosition(90, -35);
backBtn.SetLabel(&backBtnTxt);
backBtn.SetImage(&backBtnImg);
backBtn.SetImageOver(&backBtnImgOver);
backBtn.SetSoundOver(&btnSoundOver);
backBtn.SetSoundClick(&btnSoundClick);
backBtn.SetTrigger(trigA);
backBtn.SetTrigger(trig2);
backBtn.SetEffectGrow();
GuiText resetBtnTxt("Reset Settings", 22, (GXColor){0, 0, 0, 255});
GuiImage resetBtnImg(&btnOutline);
GuiImage resetBtnImgOver(&btnOutlineOver);
GuiButton resetBtn(btnOutline.GetWidth(), btnOutline.GetHeight());
resetBtn.SetAlignment(ALIGN_RIGHT, ALIGN_BOTTOM);
resetBtn.SetPosition(-90, -35);
resetBtn.SetLabel(&resetBtnTxt);
resetBtn.SetImage(&resetBtnImg);
resetBtn.SetImageOver(&resetBtnImgOver);
resetBtn.SetSoundOver(&btnSoundOver);
resetBtn.SetSoundClick(&btnSoundClick);
resetBtn.SetTrigger(trigA);
resetBtn.SetTrigger(trig2);
resetBtn.SetEffectGrow();
HaltGui();
GuiWindow w(screenwidth, screenheight);
w.Append(&titleTxt);
w.Append(&savingBtn); w.Append(&savingBtn);
w.Append(&menuBtn); w.Append(&menuBtn);
w.Append(&networkBtn); w.Append(&networkBtn);
w.Append(&cheatsBtn); w.Append(&cheatsBtn);
w.Append(&backBtn);
w.Append(&resetBtn);
mainWindow->Append(&w);
ResumeGui(); ResumeGui();
@ -3425,9 +3423,9 @@ static int MenuSettings()
else else
{ {
GCSettings.gamegenie ^= 1; GCSettings.gamegenie ^= 1;
if (GCSettings.gamegenie) sprintf(s, "ON"); if (GCSettings.gamegenie) sprintf(gameGenieTxt, "ON");
else sprintf(s, "OFF"); else sprintf(gameGenieTxt, "OFF");
cheatsBtnTxt2.SetText(s); cheatsBtnTxt2.SetText(gameGenieTxt);
} }
} }
else if(backBtn.GetState() == STATE_CLICKED) else if(backBtn.GetState() == STATE_CLICKED)