From 7dea5fb7dfff248dbeaa94bef2457939d59625b5 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 13 Sep 2020 13:46:34 +0200 Subject: [PATCH] Renamed the setting 'Open menu effect' to 'Menu opening effect'. --- USERGUIDE.md | 4 ++-- es-app/src/guis/GuiMenu.cpp | 8 ++++---- es-core/src/Settings.cpp | 2 +- es-core/src/Window.cpp | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/USERGUIDE.md b/USERGUIDE.md index 6a091c6e5..98231313f 100644 --- a/USERGUIDE.md +++ b/USERGUIDE.md @@ -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** diff --git a/es-app/src/guis/GuiMenu.cpp b/es-app/src/guis/GuiMenu.cpp index b486d3ab8..108ac6fa4 100644 --- a/es-app/src/guis/GuiMenu.cpp +++ b/es-app/src/guis/GuiMenu.cpp @@ -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(); }); diff --git a/es-core/src/Settings.cpp b/es-core/src/Settings.cpp index ecbafc7e0..ca357d3df 100644 --- a/es-core/src/Settings.cpp +++ b/es-core/src/Settings.cpp @@ -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; diff --git a/es-core/src/Window.cpp b/es-core/src/Window.cpp index 6478f756e..71b4c3b48 100644 --- a/es-core/src/Window.cpp +++ b/es-core/src/Window.cpp @@ -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);