diff --git a/es-app/src/views/GamelistView.cpp b/es-app/src/views/GamelistView.cpp index 4795a0157..228a8fe43 100644 --- a/es-app/src/views/GamelistView.cpp +++ b/es-app/src/views/GamelistView.cpp @@ -176,9 +176,6 @@ void GamelistView::onThemeChanged(const std::shared_ptr& theme) mCarousel = std::make_unique>(); if (element.second.has("defaultImage")) mCarousel->setDefaultImage(element.second.get("defaultImage")); - // TEMPORARY: Backward compatiblity due to property name changes. - if (element.second.has("defaultItem")) - mCarousel->setDefaultImage(element.second.get("defaultItem")); mPrimary = mCarousel.get(); } mPrimary->setCursorChangedCallback( diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp index c370591f7..7817fd352 100644 --- a/es-app/src/views/SystemView.cpp +++ b/es-app/src/views/SystemView.cpp @@ -575,14 +575,6 @@ void SystemView::populate() } }); if (mCarousel != nullptr || mGrid != nullptr) { - if (mCarousel != nullptr) { - // TEMPORARY: Backward compatiblity due to property name changes. - if (element.second.has("staticItem")) - imagePath = element.second.get("staticItem"); - if (element.second.has("defaultItem")) - defaultImagePath = - element.second.get("defaultItem"); - } if (element.second.has("staticImage")) imagePath = element.second.get("staticImage"); if (element.second.has("defaultImage")) diff --git a/es-core/src/components/primary/GridComponent.h b/es-core/src/components/primary/GridComponent.h index 1d40a1788..adfae0f14 100644 --- a/es-core/src/components/primary/GridComponent.h +++ b/es-core/src/components/primary/GridComponent.h @@ -798,17 +798,11 @@ void GridComponent::applyTheme(const std::shared_ptr& theme, if (!elem) return; - // TEMPORARY: Support for itemType is for backward compatiblity due to property name changes. - if (mGamelistView && properties && (elem->has("imageType") || elem->has("itemType"))) { + if (mGamelistView && properties && elem->has("imageType")) { const std::vector supportedImageTypes { "marquee", "cover", "backcover", "3dbox", "physicalmedia", "screenshot", "titlescreen", "miximage", "fanart", "none"}; - std::string imageTypesString; - - if (elem->has("imageType")) - imageTypesString = elem->get("imageType"); - else - imageTypesString = elem->get("itemType"); + std::string imageTypesString {elem->get("imageType")}; for (auto& character : imageTypesString) { if (std::isspace(character)) diff --git a/es-core/src/components/primary/TextListComponent.h b/es-core/src/components/primary/TextListComponent.h index 007ca572f..a430d4084 100644 --- a/es-core/src/components/primary/TextListComponent.h +++ b/es-core/src/components/primary/TextListComponent.h @@ -685,7 +685,6 @@ void TextListComponent::applyTheme(const std::shared_ptr& theme, glm::clamp(elem->get("selectorVerticalOffset"), -1.0f, 1.0f) * scale; } else if (elem->has("selectorOffsetY")) { - // TEMPORARY: This property will only be usable for legacy themes as of 2.0.0-beta const float scale {this->mParent ? this->mParent->getSize().y : Renderer::getScreenHeight()}; mSelectorVerticalOffset =