Skip to content

Commit

Permalink
Update the grid's help prompt
Browse files Browse the repository at this point in the history
- Add a left+right shoulder button icon
- Update the outdated help prompt to match the one from the Basic view
  • Loading branch information
benjdero committed Apr 5, 2018
1 parent 75844f4 commit 37a16fe
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 5 deletions.
16 changes: 11 additions & 5 deletions es-app/src/views/gamelist/GridGameListView.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "views/gamelist/GridGameListView.h"

#include "views/UIModeController.h"
#include "views/ViewController.h"
#include "CollectionSystemManager.h"
#include "Settings.h"
#include "SystemData.h"

Expand Down Expand Up @@ -101,12 +103,16 @@ std::vector<HelpPrompt> GridGameListView::getHelpPrompts()
std::vector<HelpPrompt> prompts;

if(Settings::getInstance()->getBool("QuickSystemSelect"))
{
prompts.push_back(HelpPrompt("l", "system"));
prompts.push_back(HelpPrompt("r", "system"));
}
prompts.push_back(HelpPrompt("up/down/left/right", "scroll"));
prompts.push_back(HelpPrompt("lr", "system"));
prompts.push_back(HelpPrompt("up/down/left/right", "choose"));
prompts.push_back(HelpPrompt("a", "launch"));
prompts.push_back(HelpPrompt("b", "back"));
prompts.push_back(HelpPrompt("select", "options"));
prompts.push_back(HelpPrompt("x", "random"));
if(mRoot->getSystem()->isGameSystem() && !UIModeController::getInstance()->isUIModeKid())
{
std::string prompt = CollectionSystemManager::get()->getEditingCollection();
prompts.push_back(HelpPrompt("y", prompt));
}
return prompts;
}
1 change: 1 addition & 0 deletions es-core/src/components/HelpComponent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ static const std::map<std::string, const char*> ICON_PATH_MAP {
{ "y", ":/help/button_y.svg" },
{ "l", ":/help/button_l.svg" },
{ "r", ":/help/button_r.svg" },
{ "lr", ":/help/button_lr.svg" },
{ "start", ":/help/button_start.svg" },
{ "select", ":/help/button_select.svg" }
};
Expand Down
69 changes: 69 additions & 0 deletions resources/help/button_lr.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 37a16fe

Please sign in to comment.