Added a menu option to enable or disable theme variant triggers.

es-app/src/guis/GuiMenu.cpp

@@ -685,6 +685,21 @@ void GuiMenu::openUIOptions()
     screensaverRow.makeAcceptInputHandler(std::bind(&GuiMenu::openScreensaverOptions, this));
     s->addRow(screensaverRow);
 
+    // Enable theme variant triggers.
+    auto themeVariantTriggers = std::make_shared<SwitchComponent>();
+    themeVariantTriggers->setState(Settings::getInstance()->getBool("ThemeVariantTriggers"));
+    s->addWithLabel("ENABLE THEME VARIANT TRIGGERS", themeVariantTriggers);
+    s->addSaveFunc([themeVariantTriggers, s] {
+        if (themeVariantTriggers->getState() !=
+            Settings::getInstance()->getBool("ThemeVariantTriggers")) {
+            Settings::getInstance()->setBool("ThemeVariantTriggers",
+                                             themeVariantTriggers->getState());
+            s->setNeedsSaving();
+            s->setNeedsReloading();
+            s->setInvalidateCachedBackground();
+        }
+    });
+
     // Blur background when the menu is open.
     auto menuBlurBackground = std::make_shared<SwitchComponent>();
     menuBlurBackground->setState(Settings::getInstance()->getBool("MenuBlurBackground"));

es-app/src/views/ViewController.cpp

@@ -827,8 +827,7 @@ std::shared_ptr<GamelistView> ViewController::getGamelistView(SystemData* system
             }
         }
     }
-    else {
+    else if (Settings::getInstance()->getBool("ThemeVariantTriggers")) {
-        // Variant triggers.
         const auto overrides = system->getTheme()->getCurrentThemeSetSelectedVariantOverrides();
 
         if (!overrides.empty()) {

es-core/src/Settings.cpp

@@ -203,6 +203,7 @@ void Settings::setDefaults()
 #endif
     mBoolMap["ScreensaverVideoBlur"] = {false, false};
 
+    mBoolMap["ThemeVariantTriggers"] = {true, true};
     mBoolMap["MenuBlurBackground"] = {true, true};
     mBoolMap["GamelistVideoPillarbox"] = {true, true};
     mBoolMap["GamelistVideoScanlines"] = {false, false};