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

Removed the 'Enable menu scroll indicators' menu option.

Browse source
This commit is contained in:
Leon Styhre 2022-06-10 19:54:29 +02:00
parent 63e936ba09
commit 0ef6a22248
3 changed files with 89 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
es-app/src/guis/GuiMenu.cpp
View file

@ -604,18 +604,6 @@ void GuiMenu::openUIOptions()
} }
}); });
// Enable menu scroll indicators.
auto scroll_indicators = std::make_shared<SwitchComponent>();
scroll_indicators->setState(Settings::getInstance()->getBool("ScrollIndicators"));
s->addWithLabel("ENABLE MENU SCROLL INDICATORS", scroll_indicators);
s->addSaveFunc([scroll_indicators, s] {
if (scroll_indicators->getState() != Settings::getInstance()->getBool("ScrollIndicators")) {
Settings::getInstance()->setBool("ScrollIndicators", scroll_indicators->getState());
s->setNeedsSaving();
s->setInvalidateCachedBackground();
}
});
// Enable the 'Y' button for tagging games as favorites. // Enable the 'Y' button for tagging games as favorites.
auto favorites_add_button = std::make_shared<SwitchComponent>(); auto favorites_add_button = std::make_shared<SwitchComponent>();
favorites_add_button->setState(Settings::getInstance()->getBool("FavoritesAddButton")); favorites_add_button->setState(Settings::getInstance()->getBool("FavoritesAddButton"));

1
es-core/src/Settings.cpp
View file

@ -186,7 +186,6 @@ void Settings::setDefaults()
mBoolMap["FavoritesStar"] = {true, true}; mBoolMap["FavoritesStar"] = {true, true};
mBoolMap["ListScrollOverlay"] = {false, false}; mBoolMap["ListScrollOverlay"] = {false, false};
mBoolMap["VirtualKeyboard"] = {true, true}; mBoolMap["VirtualKeyboard"] = {true, true};
mBoolMap["ScrollIndicators"] = {true, true};
mBoolMap["FavoritesAddButton"] = {true, true}; mBoolMap["FavoritesAddButton"] = {true, true};
mBoolMap["RandomAddButton"] = {false, false}; mBoolMap["RandomAddButton"] = {false, false};
mBoolMap["GamelistFilters"] = {true, true}; mBoolMap["GamelistFilters"] = {true, true};

28
es-core/src/components/ScrollIndicatorComponent.h
View file

@ -30,21 +30,6 @@ public:
scrollUp->setOpacity(0.0f); scrollUp->setOpacity(0.0f);
scrollDown->setOpacity(0.0f); scrollDown->setOpacity(0.0f);
if (!Settings::getInstance()->getBool("ScrollIndicators")) {
// If the scroll indicators setting is disabled, then show a permanent down arrow
// symbol when the component list contains more entries than can fit on screen.
componentList.get()->setScrollIndicatorChangedCallback(
[scrollUp, scrollDown](ComponentList::ScrollIndicator state, bool singleRowScroll) {
if (state == ComponentList::SCROLL_UP ||
state == ComponentList::SCROLL_UP_DOWN ||
state == ComponentList::SCROLL_DOWN) {
scrollDown->setOpacity(1.0f);
}
});
}
else {
// If the scroll indicator setting is enabled, then also show the up and up/down
// combination and switch between these as the list is scrolled.
componentList.get()->setScrollIndicatorChangedCallback( componentList.get()->setScrollIndicatorChangedCallback(
[this, scrollUp, scrollDown](ComponentList::ScrollIndicator state, [this, scrollUp, scrollDown](ComponentList::ScrollIndicator state,
bool singleRowScroll) { bool singleRowScroll) {
@ -110,8 +95,8 @@ public:
scrollUp->setOpacity(glm::mix(0.0f, 1.0f, t)); scrollUp->setOpacity(glm::mix(0.0f, 1.0f, t));
}; };
scrollUp->setAnimation( scrollUp->setAnimation(
new LambdaAnimation(upFadeInFunc, static_cast<int>(fadeTime)), 0, new LambdaAnimation(upFadeInFunc, static_cast<int>(fadeTime)), 0, nullptr,
nullptr, false); false);
} }
if (upFadeOut) { if (upFadeOut) {
@ -119,8 +104,8 @@ public:
scrollUp->setOpacity(glm::mix(0.0f, 1.0f, t)); scrollUp->setOpacity(glm::mix(0.0f, 1.0f, t));
}; };
scrollUp->setAnimation( scrollUp->setAnimation(
new LambdaAnimation(upFadeOutFunc, static_cast<int>(fadeTime)), 0, new LambdaAnimation(upFadeOutFunc, static_cast<int>(fadeTime)), 0, nullptr,
nullptr, true); true);
} }
if (downFadeIn) { if (downFadeIn) {
@ -128,8 +113,8 @@ public:
scrollDown->setOpacity(glm::mix(0.0f, 1.0f, t)); scrollDown->setOpacity(glm::mix(0.0f, 1.0f, t));
}; };
scrollDown->setAnimation( scrollDown->setAnimation(
new LambdaAnimation(downFadeInFunc, static_cast<int>(fadeTime)), 0, new LambdaAnimation(downFadeInFunc, static_cast<int>(fadeTime)), 0, nullptr,
nullptr, false); false);
} }
if (downFadeOut) { if (downFadeOut) {
@ -144,7 +129,6 @@ public:
mPreviousScrollState = state; mPreviousScrollState = state;
}); });
} }
}
private: private:
ComponentList::ScrollIndicator mPreviousScrollState; ComponentList::ScrollIndicator mPreviousScrollState;