Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-18 07:05:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move menu open code to ViewController so you can open it in the system

Browse source 
select
This commit is contained in:
Aloshi 2013-12-20 15:47:21 -06:00
parent bce46cb925
commit 4b6f8d9007
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/views/GameListView.cpp
View file

@ -23,12 +23,6 @@ bool GameListView::input(InputConfig* config, Input input)
})); }));
mTheme->playSound("menuOpenSound"); mTheme->playSound("menuOpenSound");
return true; return true;
}else if(config->isMappedTo("menu", input) && input.value != 0)
{
// open menu
mWindow->pushGui(new GuiMenu(mWindow));
mTheme->playSound("menuOpenSound");
return true;
}else if(config->isMappedTo("select", input) && input.value != 0) }else if(config->isMappedTo("select", input) && input.value != 0)
{ {
// open fast select // open fast select

10
src/views/ViewController.cpp
View file

@ -5,6 +5,7 @@
#include "BasicGameListView.h" #include "BasicGameListView.h"
#include "DetailedGameListView.h" #include "DetailedGameListView.h"
#include "GridGameListView.h" #include "GridGameListView.h"
#include "../components/GuiMenu.h"
#include "../animations/LaunchAnimation.h" #include "../animations/LaunchAnimation.h"
#include "../animations/MoveCameraAnimation.h" #include "../animations/MoveCameraAnimation.h"
#include "../animations/LambdaAnimation.h" #include "../animations/LambdaAnimation.h"
@ -176,6 +177,15 @@ bool ViewController::input(InputConfig* config, Input input)
if(mLockInput) if(mLockInput)
return true; return true;
// open menu
if(config->isMappedTo("menu", input) && input.value != 0)
{
// open menu
mWindow->pushGui(new GuiMenu(mWindow));
ThemeData().playSound("menuOpenSound");
return true;
}
if(mCurrentView) if(mCurrentView)
return mCurrentView->input(config, input); return mCurrentView->input(config, input);