mirror of
https://github.com/wiidev/usbloadergx.git
synced 2024-11-29 14:44:17 +01:00
Fixed "back" button for game info page (issue 976, introduced in r750)
This commit is contained in:
parent
51d2eb5037
commit
c797c3fa13
File diff suppressed because one or more lines are too long
2
gui.pnps
2
gui.pnps
@ -1 +1 @@
|
|||||||
<pd><ViewState><e p="gui\source\mload" x="true"></e><e p="gui\source\settings" x="false"></e><e p="gui\source\images" x="false"></e><e p="gui\source\prompts" x="true"></e><e p="gui\source\banner" x="false"></e><e p="gui\source\cheats" x="false"></e><e p="gui\source\network" x="false"></e><e p="gui\source\unzip" x="false"></e><e p="gui\source\usbloader" x="true"></e><e p="gui\source\xml" x="false"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\ramdisc" x="false"></e><e p="gui\source\sounds" x="false"></e><e p="gui\source\wad" x="false"></e><e p="gui" x="true"></e><e p="gui\source\homebrewboot" x="false"></e><e p="gui\source\language" x="false"></e><e p="gui\source" x="true"></e><e p="gui\source\libwbfs" x="false"></e><e p="gui\source\libwiigui" x="false"></e><e p="gui\source\patches" x="false"></e></ViewState></pd>
|
<pd><ViewState><e p="gui\source\mload" x="false"></e><e p="gui\source\settings" x="false"></e><e p="gui\source\images" x="false"></e><e p="gui\source\prompts" x="false"></e><e p="gui\source\banner" x="false"></e><e p="gui\source\cheats" x="false"></e><e p="gui\source\network" x="false"></e><e p="gui\source\unzip" x="false"></e><e p="gui\source\usbloader" x="false"></e><e p="gui\source\xml" x="false"></e><e p="gui\source\fonts" x="false"></e><e p="gui\source\ramdisc" x="false"></e><e p="gui\source\sounds" x="false"></e><e p="gui\source\wad" x="false"></e><e p="gui" x="true"></e><e p="gui\source\homebrewboot" x="false"></e><e p="gui\source\language" x="false"></e><e p="gui\source" x="true"></e><e p="gui\source\libwbfs" x="false"></e><e p="gui\source\libwiigui" x="false"></e><e p="gui\source\patches" x="false"></e></ViewState></pd>
|
@ -797,29 +797,36 @@ int showGameInfo(char *ID) {
|
|||||||
Sys_Reboot();
|
Sys_Reboot();
|
||||||
|
|
||||||
else if ((backBtn.GetState()==STATE_CLICKED)||(backBtn.GetState()==STATE_HELD)) {
|
else if ((backBtn.GetState()==STATE_CLICKED)||(backBtn.GetState()==STATE_HELD)) {
|
||||||
|
backBtn.ResetState();
|
||||||
if (page==1) {
|
if (page==1) {
|
||||||
choice=1;
|
choice=1;
|
||||||
synopsisTxt = NULL;
|
synopsisTxt = NULL;
|
||||||
break;
|
break;
|
||||||
} else if (page==2) {
|
} else if (page==2) {
|
||||||
HaltGui();
|
HaltGui();
|
||||||
|
gameinfoWindow2.Remove(&nextBtn);
|
||||||
|
gameinfoWindow2.Remove(&backBtn);
|
||||||
|
gameinfoWindow2.Remove(&homeBtn);
|
||||||
gameinfoWindow2.SetVisible(false);
|
gameinfoWindow2.SetVisible(false);
|
||||||
gameinfoWindow.SetVisible(true);
|
gameinfoWindow.SetVisible(true);
|
||||||
|
gameinfoWindow.Append(&backBtn);
|
||||||
|
gameinfoWindow.Append(&nextBtn);
|
||||||
|
gameinfoWindow.Append(&homeBtn);
|
||||||
mainWindow->Remove(&gameinfoWindow2);
|
mainWindow->Remove(&gameinfoWindow2);
|
||||||
ResumeGui();
|
ResumeGui();
|
||||||
page=1;
|
page=1;
|
||||||
}
|
}
|
||||||
} else if (((nextBtn.GetState()==STATE_CLICKED)||(nextBtn.GetState()==STATE_HELD))&&
|
} else if (((nextBtn.GetState()==STATE_CLICKED)||(nextBtn.GetState()==STATE_HELD))&&
|
||||||
(strcmp(gameinfo.synopsis,"") != 0)) {
|
(strcmp(gameinfo.synopsis,"") != 0)) {
|
||||||
|
nextBtn.ResetState();
|
||||||
if (page==1) {
|
if (page==1) {
|
||||||
nextBtn.ResetState();
|
|
||||||
HaltGui();
|
HaltGui();
|
||||||
|
gameinfoWindow.Remove(&nextBtn);
|
||||||
|
gameinfoWindow.Remove(&backBtn);
|
||||||
|
gameinfoWindow.Remove(&homeBtn);
|
||||||
gameinfoWindow.SetVisible(false);
|
gameinfoWindow.SetVisible(false);
|
||||||
gameinfoWindow2.SetVisible(true);
|
gameinfoWindow2.SetVisible(true);
|
||||||
coverImg->SetPosition(15,30);
|
coverImg->SetPosition(15,30);
|
||||||
|
|
||||||
//backBtn.SetClickable(false);
|
|
||||||
gameinfoWindow2.Append(&nextBtn);
|
gameinfoWindow2.Append(&nextBtn);
|
||||||
gameinfoWindow2.Append(&backBtn);
|
gameinfoWindow2.Append(&backBtn);
|
||||||
gameinfoWindow2.Append(&homeBtn);
|
gameinfoWindow2.Append(&homeBtn);
|
||||||
@ -827,9 +834,10 @@ int showGameInfo(char *ID) {
|
|||||||
ResumeGui();
|
ResumeGui();
|
||||||
page=2;
|
page=2;
|
||||||
} else {
|
} else {
|
||||||
nextBtn.ResetState();
|
|
||||||
HaltGui();
|
HaltGui();
|
||||||
//backBtn.SetClickable(true);
|
gameinfoWindow2.Remove(&nextBtn);
|
||||||
|
gameinfoWindow2.Remove(&backBtn);
|
||||||
|
gameinfoWindow2.Remove(&homeBtn);
|
||||||
gameinfoWindow2.SetVisible(false);
|
gameinfoWindow2.SetVisible(false);
|
||||||
gameinfoWindow.SetVisible(true);
|
gameinfoWindow.SetVisible(true);
|
||||||
gameinfoWindow.Append(&backBtn);
|
gameinfoWindow.Append(&backBtn);
|
||||||
@ -839,7 +847,6 @@ int showGameInfo(char *ID) {
|
|||||||
ResumeGui();
|
ResumeGui();
|
||||||
page=1;
|
page=1;
|
||||||
}
|
}
|
||||||
nextBtn.ResetState();
|
|
||||||
|
|
||||||
} else if ((upBtn.GetState()==STATE_CLICKED||upBtn.GetState()==STATE_HELD) && page==2) {
|
} else if ((upBtn.GetState()==STATE_CLICKED||upBtn.GetState()==STATE_HELD) && page==2) {
|
||||||
//int l=synopsisTxt->GetFirstLine()-1;
|
//int l=synopsisTxt->GetFirstLine()-1;
|
||||||
@ -871,9 +878,6 @@ int showGameInfo(char *ID) {
|
|||||||
HaltGui();
|
HaltGui();
|
||||||
gameinfoWindow2.SetVisible(false);
|
gameinfoWindow2.SetVisible(false);
|
||||||
gameinfoWindow.SetVisible(true);
|
gameinfoWindow.SetVisible(true);
|
||||||
//gameinfoWindow.Append(&backBtn);
|
|
||||||
//gameinfoWindow.Append(&nextBtn);
|
|
||||||
//gameinfoWindow.Append(&homeBtn);
|
|
||||||
mainWindow->Remove(&gameinfoWindow2);
|
mainWindow->Remove(&gameinfoWindow2);
|
||||||
ResumeGui();
|
ResumeGui();
|
||||||
page=1;
|
page=1;
|
||||||
|
Loading…
Reference in New Issue
Block a user