funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-12 17:58:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed printf and corrected fallback img that was not used correctly if user theme

Browse Source
This commit is contained in:
Vincent-FK 2021-06-25 00:46:38 +02:00
parent ee5489b18e
commit 9bdb23d7da
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RetroFE/Source/Graphics/Component/ReloadableMedia.cpp
View File

@ -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_) if(!loadedComponent_ && imageFallback_)
{ {
std::string imagePath; std::string imagePath;
ImageBuilder imageBuild; 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" ); imagePath = Utils::combinePath( imagePath, "system_artwork" );
loadedComponent_ = imageBuild.CreateImage( imagePath, page, std::string("fallback"), scaleX_, scaleY_, ditheringAuthorized_ ); loadedComponent_ = imageBuild.CreateImage( imagePath, page, std::string("fallback"), scaleX_, scaleY_, ditheringAuthorized_ );
} }

3
RetroFE/Source/Graphics/Component/ScrollingList.cpp
View File

@ -726,7 +726,8 @@ bool ScrollingList::allocateTexture( unsigned int index, Item *item )
// Image fallback // Image fallback
if ( !t && imageType_.compare(std::string("null"))){ 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" ); imagePath = Utils::combinePath( imagePath, "system_artwork" );
t = imageBuild.CreateImage( imagePath, page, std::string("fallback"), scaleX_, scaleY_, ditheringAuthorized_ ); t = imageBuild.CreateImage( imagePath, page, std::string("fallback"), scaleX_, scaleY_, ditheringAuthorized_ );
} }

2
RetroFE/Source/Graphics/PageBuilder.cpp
View File

@ -100,8 +100,6 @@ Page *PageBuilder::buildPage( std::string collectionName )
} }
layoutFile = Utils::combinePath(layoutPath, layoutPage + ".xml"); layoutFile = Utils::combinePath(layoutPath, layoutPage + ".xml");
printf("In %s, layoutFile is %s \n", __func__, layoutFile.c_str());
if ( screenWidth_*3/4 == screenHeight_ ) if ( screenWidth_*3/4 == screenHeight_ )
layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 4x3.xml"); layoutFileAspect = Utils::combinePath(layoutPath, layoutPage + " 4x3.xml");
else if ( screenWidth_*4/3 == screenHeight_ ) else if ( screenWidth_*4/3 == screenHeight_ )