From 9bdb23d7da2394c04e17d4254c4fbe7558506a90 Mon Sep 17 00:00:00 2001 From: Vincent-FK Date: Fri, 25 Jun 2021 00:46:38 +0200 Subject: [PATCH] removed printf and corrected fallback img that was not used correctly if user theme --- RetroFE/Source/Graphics/Component/ReloadableMedia.cpp | 5 +++-- RetroFE/Source/Graphics/Component/ScrollingList.cpp | 3 ++- RetroFE/Source/Graphics/PageBuilder.cpp | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp b/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp index 900d360..3ccf7c0 100755 --- a/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp +++ b/RetroFE/Source/Graphics/Component/ReloadableMedia.cpp @@ -414,12 +414,13 @@ void ReloadableMedia::reloadTexture( bool previousItem ) } } - // if image and artwork was not specified, image fall back + // if image and artwork was not specified, image fallback if(!loadedComponent_ && imageFallback_) { std::string imagePath; ImageBuilder imageBuild; - imagePath = Utils::combinePath(Configuration::isUserLayout_?Configuration::userPath:Configuration::absolutePath, "collections", collectionName ); + //imagePath = Utils::combinePath(Configuration::isUserLayout_?Configuration::userPath:Configuration::absolutePath, "collections", collectionName ); + imagePath = Utils::combinePath(Configuration::absolutePath, "collections", collectionName ); // forcing absolutePath and folder "Collection" for backups imagePath = Utils::combinePath( imagePath, "system_artwork" ); loadedComponent_ = imageBuild.CreateImage( imagePath, page, std::string("fallback"), scaleX_, scaleY_, ditheringAuthorized_ ); } diff --git a/RetroFE/Source/Graphics/Component/ScrollingList.cpp b/RetroFE/Source/Graphics/Component/ScrollingList.cpp index ed4d81d..151ab3e 100755 --- a/RetroFE/Source/Graphics/Component/ScrollingList.cpp +++ b/RetroFE/Source/Graphics/Component/ScrollingList.cpp @@ -726,7 +726,8 @@ bool ScrollingList::allocateTexture( unsigned int index, Item *item ) // Image fallback if ( !t && imageType_.compare(std::string("null"))){ - imagePath = Utils::combinePath(Configuration::isUserLayout_?Configuration::userPath:Configuration::absolutePath, "collections", collectionName ); + //imagePath = Utils::combinePath(Configuration::isUserLayout_?Configuration::userPath:Configuration::absolutePath, "collections", collectionName ); + imagePath = Utils::combinePath(Configuration::absolutePath, "collections", collectionName ); // forcing absolutePath and folder "Collection" for backups imagePath = Utils::combinePath( imagePath, "system_artwork" ); t = imageBuild.CreateImage( imagePath, page, std::string("fallback"), scaleX_, scaleY_, ditheringAuthorized_ ); } diff --git a/RetroFE/Source/Graphics/PageBuilder.cpp b/RetroFE/Source/Graphics/PageBuilder.cpp index f1adc48..17451b5 100755 --- a/RetroFE/Source/Graphics/PageBuilder.cpp +++ b/RetroFE/Source/Graphics/PageBuilder.cpp @@ -100,8 +100,6 @@ Page *PageBuilder::buildPage( std::string collectionName ) } layoutFile = Utils::combinePath(layoutPath, layoutPage + ".xml"); - printf("In %s, layoutFile is %s \n", __func__, layoutFile.c_str()); - if ( screenWidth_*3/4 == screenHeight_ ) layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 4x3.xml"); else if ( screenWidth_*4/3 == screenHeight_ )