Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-16 20:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #522 from cmitu/fix-uimodes-in

Browse source 
Fix Kiosk mode filters applying also to Kid mode
This commit is contained in:
Jools Wills 2019-01-24 22:08:28 +00:00 committed by GitHub
parent a6d5c02cd2 f8e3ac1340
commit f899920598
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
es-app/src/FileFilterIndex.cpp
View file

@ -248,7 +248,7 @@ void FileFilterIndex::resetFilters()
void FileFilterIndex::setUIModeFilters()
{
if(!Settings::getInstance()->getBool("ForceDisableFilters")){
if (!UIModeController::getInstance()->isUIModeFull())
if (UIModeController::getInstance()->isUIModeKiosk())
{
filterByHidden = true;
std::vector<std::string> val = { "FALSE" };
@ -259,7 +259,7 @@ void FileFilterIndex::setUIModeFilters()
filterByKidGame = true;
std::vector<std::string> val = { "TRUE" };
setFilter(KIDGAME_FILTER, &val);
}
}
}
}

6
es-app/src/views/UIModeController.cpp
View file

@ -94,6 +94,12 @@ bool UIModeController::isUIModeKid()
((mCurrentUIMode == "Kid") && !Settings::getInstance()->getBool("ForceKiosk")));
}
bool UIModeController::isUIModeKiosk()
{
return (Settings::getInstance()->getBool("ForceKiosk") ||
((mCurrentUIMode == "Kiosk") && !Settings::getInstance()->getBool("ForceKid")));
}
std::string UIModeController::getFormattedPassKeyStr()
{
// supported sequence-inputs: u (up), d (down), l (left), r (right), a, b, x, y

1
es-app/src/views/UIModeController.h
View file

@ -26,6 +26,7 @@ public:
bool isUIModeFull();
bool isUIModeKid();
bool isUIModeKiosk();
inline std::vector<std::string> getUIModes() { return mUIModes; };
private:
UIModeController();