Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-02-06 07:15:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed an issue in CarouselComponent and GridComponent where the default image was rendered when it shouldn't.

Browse source 
Also moved a property position in GridComponent.
This commit is contained in:
Leon Styhre 2022-12-11 12:10:08 +01:00
parent c5b42379c0
commit abcd3e5bac
3 changed files with 35 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
es-core/src/ThemeData.cpp
View file

@ -190,10 +190,10 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"backgroundGradientType", STRING}, {"backgroundGradientType", STRING},
{"selectorImage", PATH}, {"selectorImage", PATH},
{"selectorRelativeScale", FLOAT}, {"selectorRelativeScale", FLOAT},
{"selectorLayer", STRING},
{"selectorColor", COLOR}, {"selectorColor", COLOR},
{"selectorColorEnd", COLOR}, {"selectorColorEnd", COLOR},
{"selectorGradientType", STRING}, {"selectorGradientType", STRING},
{"selectorLayer", STRING},
{"text", STRING}, {"text", STRING},
{"textRelativeScale", FLOAT}, {"textRelativeScale", FLOAT},
{"textColor", COLOR}, {"textColor", COLOR},

7
es-core/src/components/primary/CarouselComponent.h
View file

@ -278,7 +278,9 @@ void CarouselComponent<T>::addEntry(Entry& entry, const std::shared_ptr<ThemeDat
if (!mImageColorGradientHorizontal) if (!mImageColorGradientHorizontal)
defaultImage->setColorGradientHorizontal(false); defaultImage->setColorGradientHorizontal(false);
defaultImage->setRotateByTargetSize(true); defaultImage->setRotateByTargetSize(true);
entry.data.item = defaultImage; // For the gamelist view the default image is applied in onDemandTextureLoad().
if (!mGamelistView)
entry.data.item = defaultImage;
} }
} }
@ -455,6 +457,9 @@ template <typename T> void CarouselComponent<T>::onDemandTextureLoad()
else if (mImageType == "none") // Display the game name as text. else if (mImageType == "none") // Display the game name as text.
return; return;
if (entry.data.imagePath == "")
entry.data.imagePath = entry.data.defaultImagePath;
auto theme = game->getSystem()->getTheme(); auto theme = game->getSystem()->getTheme();
updateEntry(entry, theme); updateEntry(entry, theme);
} }

51
es-core/src/components/primary/GridComponent.h
View file

@ -65,7 +65,7 @@ public:
const std::string& getImageType() { return mImageType; } const std::string& getImageType() { return mImageType; }
void setImageType(std::string imageType) { mImageType = imageType; } void setImageType(std::string imageType) { mImageType = imageType; }
const std::string& getDefaultImage() { return mDefaultImage; } const std::string& getDefaultImage() { return mDefaultImage; }
void setDefaultImage(std::string defaultItem) { mDefaultImage = defaultItem; } void setDefaultImage(std::string defaultImage) { mDefaultImage = defaultImage; }
bool input(InputConfig* config, Input input) override; bool input(InputConfig* config, Input input) override;
void update(int deltaTime) override; void update(int deltaTime) override;
void render(const glm::mat4& parentTrans) override; void render(const glm::mat4& parentTrans) override;
@ -104,18 +104,18 @@ private:
bool remove(const T& obj) override { return List::remove(obj); } bool remove(const T& obj) override { return List::remove(obj); }
int size() const override { return List::size(); } int size() const override { return List::size(); }
enum class SelectorLayer {
TOP,
MIDDLE,
BOTTOM
};
enum class ImageFit { enum class ImageFit {
CONTAIN, CONTAIN,
FILL, FILL,
COVER COVER
}; };
enum class SelectorLayer {
TOP,
MIDDLE,
BOTTOM
};
Renderer* mRenderer; Renderer* mRenderer;
std::function<void()> mCancelTransitionsCallback; std::function<void()> mCancelTransitionsCallback;
std::function<void(CursorState state)> mCursorChangedCallback; std::function<void(CursorState state)> mCursorChangedCallback;
@ -155,11 +155,11 @@ private:
bool mHasBackgroundColor; bool mHasBackgroundColor;
std::unique_ptr<ImageComponent> mSelectorImage; std::unique_ptr<ImageComponent> mSelectorImage;
float mSelectorRelativeScale; float mSelectorRelativeScale;
SelectorLayer mSelectorLayer;
unsigned int mSelectorColor; unsigned int mSelectorColor;
unsigned int mSelectorColorEnd; unsigned int mSelectorColorEnd;
bool mSelectorColorGradientHorizontal; bool mSelectorColorGradientHorizontal;
bool mHasSelectorColor; bool mHasSelectorColor;
SelectorLayer mSelectorLayer;
float mTextRelativeScale; float mTextRelativeScale;
unsigned int mTextColor; unsigned int mTextColor;
unsigned int mTextBackgroundColor; unsigned int mTextBackgroundColor;
@ -207,11 +207,11 @@ GridComponent<T>::GridComponent()
, mBackgroundColorGradientHorizontal {true} , mBackgroundColorGradientHorizontal {true}
, mHasBackgroundColor {false} , mHasBackgroundColor {false}
, mSelectorRelativeScale {1.0f} , mSelectorRelativeScale {1.0f}
, mSelectorLayer {SelectorLayer::TOP}
, mSelectorColor {0xFFFFFFFF} , mSelectorColor {0xFFFFFFFF}
, mSelectorColorEnd {0xFFFFFFFF} , mSelectorColorEnd {0xFFFFFFFF}
, mSelectorColorGradientHorizontal {true} , mSelectorColorGradientHorizontal {true}
, mHasSelectorColor {false} , mHasSelectorColor {false}
, mSelectorLayer {SelectorLayer::TOP}
, mTextRelativeScale {1.0f} , mTextRelativeScale {1.0f}
, mTextColor {0x000000FF} , mTextColor {0x000000FF}
, mTextBackgroundColor {0xFFFFFF00} , mTextBackgroundColor {0xFFFFFF00}
@ -254,27 +254,29 @@ void GridComponent<T>::addEntry(Entry& entry, const std::shared_ptr<ThemeData>&
} }
else if (entry.data.defaultImagePath != "" && else if (entry.data.defaultImagePath != "" &&
ResourceManager::getInstance().fileExists(entry.data.defaultImagePath)) { ResourceManager::getInstance().fileExists(entry.data.defaultImagePath)) {
auto defaultItem = std::make_shared<ImageComponent>(false, dynamic); auto defaultImage = std::make_shared<ImageComponent>(false, dynamic);
defaultItem->setLinearInterpolation(true); defaultImage->setLinearInterpolation(true);
defaultItem->setMipmapping(true); defaultImage->setMipmapping(true);
if (mImagefit == ImageFit::CONTAIN) if (mImagefit == ImageFit::CONTAIN)
defaultItem->setMaxSize(mItemSize * mImageRelativeScale); defaultImage->setMaxSize(mItemSize * mImageRelativeScale);
else if (mImagefit == ImageFit::FILL) else if (mImagefit == ImageFit::FILL)
defaultItem->setResize(mItemSize * mImageRelativeScale); defaultImage->setResize(mItemSize * mImageRelativeScale);
else if (mImagefit == ImageFit::COVER) else if (mImagefit == ImageFit::COVER)
defaultItem->setCroppedSize(mItemSize * mImageRelativeScale); defaultImage->setCroppedSize(mItemSize * mImageRelativeScale);
defaultItem->setImage(entry.data.defaultImagePath); defaultImage->setImage(entry.data.defaultImagePath);
defaultItem->applyTheme(theme, "system", "", ThemeFlags::ALL); defaultImage->applyTheme(theme, "system", "", ThemeFlags::ALL);
if (mImageColor != 0xFFFFFFFF) if (mImageColor != 0xFFFFFFFF)
defaultItem->setColorShift(mImageColor); defaultImage->setColorShift(mImageColor);
if (mImageColorEnd != mImageColor) { if (mImageColorEnd != mImageColor) {
defaultItem->setColorShiftEnd(mImageColorEnd); defaultImage->setColorShiftEnd(mImageColorEnd);
if (!mImageColorGradientHorizontal) if (!mImageColorGradientHorizontal)
defaultItem->setColorGradientHorizontal(false); defaultImage->setColorGradientHorizontal(false);
} }
defaultItem->setOrigin(0.5f, 0.5f); defaultImage->setOrigin(0.5f, 0.5f);
defaultItem->setRotateByTargetSize(true); defaultImage->setRotateByTargetSize(true);
entry.data.item = defaultItem; // For the gamelist view the default image is applied in onDemandTextureLoad().
if (!mGamelistView)
entry.data.item = defaultImage;
} }
if (!entry.data.item) { if (!entry.data.item) {
@ -392,6 +394,9 @@ template <typename T> void GridComponent<T>::onDemandTextureLoad()
else if (mImageType == "none") // Display the game name as text. else if (mImageType == "none") // Display the game name as text.
return; return;
if (entry.data.imagePath == "")
entry.data.imagePath = entry.data.defaultImagePath;
auto theme = game->getSystem()->getTheme(); auto theme = game->getSystem()->getTheme();
updateEntry(entry, theme); updateEntry(entry, theme);
} }