Renamed the setting 'Open menu effect' to 'Menu opening effect'.

This commit is contained in:
Leon Styhre 2020-09-13 13:46:34 +02:00
parent 66829b4ffa
commit 7dea5fb7df
4 changed files with 10 additions and 10 deletions

View file

@ -547,13 +547,13 @@ Defaults to Full which enables all functionality within the application. If set
The order in which to sort your gamelists. This can be overriden per game system using the game options menu, but that override will only be persistent during the application session.
**Open menu effect** _(OpenGL renderer only)_
**Menu opening effect** _(OpenGL renderer only)_
Animation to play when opening the main menu or the game options menu. Can be set to _scale-up_, _fade-in_ or _none_.
**Render scanlines for gamelist videos** _(OpenGL renderer only)_
Whether to use a shader to render scanlines for videos in the gamelist view.
Whether to use a shader to render scanlines for videos in the gamelist view. The effect is usually pretty subtle as the video is normally renderered in a limited size in the GUI, and the scanlines are sized relative to the video window size.
**Sort folders on top of gamelists**

View file

@ -398,14 +398,14 @@ void GuiMenu::openUISettings()
for (auto it = menu_effects.cbegin(); it != menu_effects.cend(); it++)
open_menu_effect->add(*it, *it, Settings::getInstance()->
getString("OpenMenuEffect") == *it);
s->addWithLabel("OPEN MENU EFFECT", open_menu_effect);
getString("MenuOpeningEffect") == *it);
s->addWithLabel("MENU OPENING EFFECT", open_menu_effect);
s->addSaveFunc([open_menu_effect] {
bool needReload = false;
if (Settings::getInstance()->getString("OpenMenuEffect") !=
if (Settings::getInstance()->getString("MenuOpeningEffect") !=
open_menu_effect->getSelected())
needReload = true;
Settings::getInstance()->setString("OpenMenuEffect", open_menu_effect->getSelected());
Settings::getInstance()->setString("MenuOpeningEffect", open_menu_effect->getSelected());
if (needReload)
ViewController::get()->reloadAll();
});

View file

@ -84,7 +84,7 @@ void Settings::setDefaults()
mStringMap["ThemeSet"] = "rbsimple-DE";
mStringMap["UIMode"] = "full";
mStringMap["DefaultSortOrder"] = "filename, ascending";
mStringMap["OpenMenuEffect"] = "scale-up";
mStringMap["MenuOpeningEffect"] = "scale-up";
mBoolMap["GamelistVideoScanlines"] = true;
mBoolMap["FoldersOnTop"] = true;
mBoolMap["FavoritesFirst"] = true;

View file

@ -294,8 +294,8 @@ void Window::render()
Renderer::drawRect(0.0f, 0.0f, Renderer::getScreenWidth(),
Renderer::getScreenHeight(), 0x00000070, 0x00000070);
// Open menu effects (scale-up and fade-in).
if (Settings::getInstance()->getString("OpenMenuEffect") == "scale-up") {
// Menu opening effects (scale-up and fade-in).
if (Settings::getInstance()->getString("MenuOpeningEffect") == "scale-up") {
if (mTopScale < 1.0)
mTopScale = Math::clamp(mTopScale+0.07, 0, 1.0);
Vector2f topCenter = top->getCenter();
@ -303,7 +303,7 @@ void Window::render()
top->setPosition({topCenter.x(), topCenter.y(), 0});
top->setScale(mTopScale);
}
if (Settings::getInstance()->getString("OpenMenuEffect") == "fade-in") {
if (Settings::getInstance()->getString("MenuOpeningEffect") == "fade-in") {
// Fade-in menu.
if (mTopOpacity < 255)
mTopOpacity = Math::clamp(mTopOpacity+15, 0, 255);