Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-25 23:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made the game options menu buttons and help text a bit more consistent.

Browse source
This commit is contained in:
Leon Styhre 2021-04-09 22:28:28 +02:00
parent 8649da9ec0
commit 2aa4ef385d
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
es-app/src/guis/GuiGamelistOptions.cpp
View file

@ -216,10 +216,15 @@ GuiGamelistOptions::GuiGamelistOptions(
}
}
// Buttons. Logic to apply or cancel settings are handled by the destructor.
if (!(!mIsCustomCollectionGroup && system->getRootFolder()->getChildren().size() == 0))
// Buttons. The logic to apply or cancel settings are handled by the destructor.
if ((!mIsCustomCollectionGroup && system->getRootFolder()->getChildren().size() == 0) ||
system->getName() == "recent") {
mMenu.addButton("CLOSE", "close", [&] { mCancelled = true; delete this; });
}
else {
mMenu.addButton("APPLY", "apply", [&] { delete this; });
mMenu.addButton("CANCEL", "cancel", [&] { mCancelled = true; delete this; });
mMenu.addButton("CANCEL", "cancel", [&] { mCancelled = true; delete this; });
}
// Center the menu.
setSize(static_cast<float>(Renderer::getScreenWidth()),
@ -283,7 +288,7 @@ GuiGamelistOptions::~GuiGamelistOptions()
}
}
if (mSystem->getRootFolder()->getChildren().size() != 0)
if (mSystem->getRootFolder()->getChildren().size() != 0 && mSystem->getName() != "recent")
NavigationSounds::getInstance()->playThemeNavigationSound(SCROLLSOUND);
}
@ -516,12 +521,18 @@ HelpStyle GuiGamelistOptions::getHelpStyle()
std::vector<HelpPrompt> GuiGamelistOptions::getHelpPrompts()
{
auto prompts = mMenu.getHelpPrompts();
prompts.push_back(HelpPrompt("a", "select"));
if (mSystem->getRootFolder()->getChildren().size() != 0)
if (mSystem->getRootFolder()->getChildren().size() > 0 ||
mIsCustomCollectionGroup || mIsCustomCollection ||
CollectionSystemsManager::get()->isEditing())
prompts.push_back(HelpPrompt("a", "select"));
if (mSystem->getRootFolder()->getChildren().size() > 0 && mSystem->getName() != "recent") {
prompts.push_back(HelpPrompt("b", "close (apply)"));
else
prompts.push_back(HelpPrompt("b", "close (cancel)"));
prompts.push_back(HelpPrompt("select", "close (cancel)"));
prompts.push_back(HelpPrompt("select", "close (cancel)"));
}
else {
prompts.push_back(HelpPrompt("b", "close"));
prompts.push_back(HelpPrompt("select", "close"));
}
return prompts;
}