From 3355d6f208c514fb8110fd71236f0adc9e965b42 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 21 Mar 2021 11:24:34 +0100 Subject: [PATCH] Added support for more imageSource types to the Grid view style. --- es-app/src/views/gamelist/GridGameListView.cpp | 8 ++++++++ es-core/src/components/ImageGridComponent.h | 14 +++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/es-app/src/views/gamelist/GridGameListView.cpp b/es-app/src/views/gamelist/GridGameListView.cpp index 84399251a..756f2daa5 100644 --- a/es-app/src/views/gamelist/GridGameListView.cpp +++ b/es-app/src/views/gamelist/GridGameListView.cpp @@ -241,8 +241,16 @@ const std::string GridGameListView::getImagePath(FileData* file) if (src == ImageSource::IMAGE) return file->getImagePath(); + else if (src == ImageSource::MIXIMAGE) + return file->getMiximagePath(); + else if (src == ImageSource::SCREENSHOT) + return file->getScreenshotPath(); + else if (src == ImageSource::COVER) + return file->getCoverPath(); else if (src == ImageSource::MARQUEE) return file->getMarqueePath(); + else if (src == ImageSource::BOX3D) + return file->get3DBoxPath(); // If no thumbnail was found, then use the image media type. if (file->getThumbnailPath() == "") diff --git a/es-core/src/components/ImageGridComponent.h b/es-core/src/components/ImageGridComponent.h index 332a2bff8..8b61aa107 100644 --- a/es-core/src/components/ImageGridComponent.h +++ b/es-core/src/components/ImageGridComponent.h @@ -25,7 +25,11 @@ enum ScrollDirection { enum ImageSource { THUMBNAIL, IMAGE, - MARQUEE + MIXIMAGE, + SCREENSHOT, + COVER, + MARQUEE, + BOX3D }; struct ImageGridData { @@ -287,8 +291,16 @@ void ImageGridComponent::applyTheme(const std::shared_ptr& theme, auto direction = elem->get("imageSource"); if (direction == "image") mImageSource = IMAGE; + else if (direction == "miximage") + mImageSource = MIXIMAGE; + else if (direction == "screenshot") + mImageSource = SCREENSHOT; + else if (direction == "cover") + mImageSource = COVER; else if (direction == "marquee") mImageSource = MARQUEE; + else if (direction == "3dbox") + mImageSource = BOX3D; else mImageSource = THUMBNAIL; }