Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Start now closes most submenus.

Browse source
This commit is contained in:
Aloshi 2014-04-30 11:55:10 -05:00
parent fc96849f08
commit 63113aeea7
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/guis/GuiScraperStart.cpp
View file

@ -1,6 +1,7 @@
#include "GuiScraperStart.h" #include "GuiScraperStart.h"
#include "GuiScraperMulti.h" #include "GuiScraperMulti.h"
#include "GuiMsgBox.h" #include "GuiMsgBox.h"
#include "../views/ViewController.h"
#include "../components/TextComponent.h" #include "../components/TextComponent.h"
#include "../components/OptionListComponent.h" #include "../components/OptionListComponent.h"
@ -102,6 +103,15 @@ bool GuiScraperStart::input(InputConfig* config, Input input)
return true; return true;
} }
if(config->isMappedTo("start", input) && input.value != 0)
{
// close everything
Window* window = mWindow;
while(window->peekGui() && window->peekGui() != window->getViewController())
delete window->peekGui();
}
return false; return false;
} }
@ -109,5 +119,6 @@ std::vector<HelpPrompt> GuiScraperStart::getHelpPrompts()
{ {
std::vector<HelpPrompt> prompts = mMenu.getHelpPrompts(); std::vector<HelpPrompt> prompts = mMenu.getHelpPrompts();
prompts.push_back(HelpPrompt("b", "back")); prompts.push_back(HelpPrompt("b", "back"));
prompts.push_back(HelpPrompt("start", "close"));
return prompts; return prompts;
} }

10
src/guis/GuiSettings.cpp
View file

@ -1,5 +1,6 @@
#include "GuiSettings.h" #include "GuiSettings.h"
#include "../Settings.h" #include "../Settings.h"
#include "../views/ViewController.h"
GuiSettings::GuiSettings(Window* window, const char* title) : GuiComponent(window), mMenu(window, title) GuiSettings::GuiSettings(Window* window, const char* title) : GuiComponent(window), mMenu(window, title)
{ {
@ -34,6 +35,14 @@ bool GuiSettings::input(InputConfig* config, Input input)
delete this; delete this;
return true; return true;
} }
if(config->isMappedTo("start", input) && input.value != 0)
{
// close everything
Window* window = mWindow;
while(window->peekGui() && window->peekGui() != window->getViewController())
delete window->peekGui();
}
return GuiComponent::input(config, input); return GuiComponent::input(config, input);
} }
@ -43,6 +52,7 @@ std::vector<HelpPrompt> GuiSettings::getHelpPrompts()
std::vector<HelpPrompt> prompts = mMenu.getHelpPrompts(); std::vector<HelpPrompt> prompts = mMenu.getHelpPrompts();
prompts.push_back(HelpPrompt("b", "back")); prompts.push_back(HelpPrompt("b", "back"));
prompts.push_back(HelpPrompt("start", "close"));
return prompts; return prompts;
} }