From d564a234c1daf93b831aeca0585a56e3e9ce864a Mon Sep 17 00:00:00 2001 From: Leon Styhre <leon@leonstyhre.com> Date: Sun, 6 Feb 2022 13:58:50 +0100 Subject: [PATCH] Implemented a better legacy theme detection in GamelistView. --- es-app/src/views/GamelistView.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/es-app/src/views/GamelistView.cpp b/es-app/src/views/GamelistView.cpp index 453c086f7..c16d632b9 100644 --- a/es-app/src/views/GamelistView.cpp +++ b/es-app/src/views/GamelistView.cpp @@ -87,7 +87,12 @@ void GamelistView::onShow() void GamelistView::onThemeChanged(const std::shared_ptr<ThemeData>& theme) { - mLegacyMode = mTheme->isLegacyTheme(); + auto themeSets = ThemeData::getThemeSets(); + std::map<std::string, ThemeData::ThemeSet>::const_iterator selectedSet { + themeSets.find(Settings::getInstance()->getString("ThemeSet"))}; + + assert(selectedSet != themeSets.cend()); + mLegacyMode = selectedSet->second.capabilities.legacyTheme; if (mLegacyMode) { legacyOnThemeChanged(theme);