Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-12-01 10:35:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Added grid theme support for setting the saturation and dimming for unfocused items.

Browse source
This commit is contained in:
Leon Styhre 2023-03-03 23:51:42 +01:00
parent 0c6c5ab986
commit 0c9259e09b
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -213,6 +213,8 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"itemTransitions", STRING}, {"itemTransitions", STRING},
{"rowTransitions", STRING}, {"rowTransitions", STRING},
{"unfocusedItemOpacity", FLOAT}, {"unfocusedItemOpacity", FLOAT},
{"unfocusedItemSaturation", FLOAT},
{"unfocusedItemDimming", FLOAT},
{"imageFit", STRING}, {"imageFit", STRING},
{"imageRelativeScale", FLOAT}, {"imageRelativeScale", FLOAT},
{"imageColor", COLOR}, {"imageColor", COLOR},

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

@ -155,6 +155,8 @@ private:
bool mInstantItemTransitions; bool mInstantItemTransitions;
bool mInstantRowTransitions; bool mInstantRowTransitions;
float mUnfocusedItemOpacity; float mUnfocusedItemOpacity;
float mUnfocusedItemSaturation;
float mUnfocusedItemDimming;
ImageFit mImagefit; ImageFit mImagefit;
float mImageRelativeScale; float mImageRelativeScale;
unsigned int mImageColor; unsigned int mImageColor;
@ -223,6 +225,8 @@ GridComponent<T>::GridComponent()
, mInstantItemTransitions {false} , mInstantItemTransitions {false}
, mInstantRowTransitions {false} , mInstantRowTransitions {false}
, mUnfocusedItemOpacity {1.0f} , mUnfocusedItemOpacity {1.0f}
, mUnfocusedItemSaturation {1.0f}
, mUnfocusedItemDimming {1.0f}
, mImagefit {ImageFit::CONTAIN} , mImagefit {ImageFit::CONTAIN}
, mImageRelativeScale {1.0f} , mImageRelativeScale {1.0f}
, mImageColor {0xFFFFFFFF} , mImageColor {0xFFFFFFFF}
@ -688,6 +692,8 @@ template <typename T> void GridComponent<T>::render(const glm::mat4& parentTrans
float scale {1.0f}; float scale {1.0f};
float opacity {1.0f}; float opacity {1.0f};
float saturation {1.0f};
float dimming {1.0f};
trans[3].y -= (mItemSize.y + mItemSpacing.y) * mScrollPos; trans[3].y -= (mItemSize.y + mItemSpacing.y) * mScrollPos;
@ -739,18 +745,24 @@ template <typename T> void GridComponent<T>::render(const glm::mat4& parentTrans
} }
opacity = mUnfocusedItemOpacity * metadataOpacity; opacity = mUnfocusedItemOpacity * metadataOpacity;
saturation = mUnfocusedItemSaturation;
dimming = mUnfocusedItemDimming;
if (*it == static_cast<size_t>(mCursor)) { if (*it == static_cast<size_t>(mCursor)) {
cursorEntry = true; cursorEntry = true;
scale = glm::mix(1.0f, mItemScale, mTransitionFactor); scale = glm::mix(1.0f, mItemScale, mTransitionFactor);
opacity = glm::mix(mUnfocusedItemOpacity * metadataOpacity, 1.0f * metadataOpacity, opacity = glm::mix(mUnfocusedItemOpacity * metadataOpacity, 1.0f * metadataOpacity,
mTransitionFactor); mTransitionFactor);
saturation = glm::mix(mUnfocusedItemSaturation, 1.0f, mTransitionFactor);
dimming = glm::mix(mUnfocusedItemDimming, 1.0f, mTransitionFactor);
} }
else if (*it == static_cast<size_t>(mLastCursor)) { else if (*it == static_cast<size_t>(mLastCursor)) {
lastCursorEntry = true; lastCursorEntry = true;
scale = glm::mix(mItemScale, 1.0f, mTransitionFactor); scale = glm::mix(mItemScale, 1.0f, mTransitionFactor);
opacity = glm::mix(1.0f * metadataOpacity, mUnfocusedItemOpacity * metadataOpacity, opacity = glm::mix(1.0f * metadataOpacity, mUnfocusedItemOpacity * metadataOpacity,
mTransitionFactor); mTransitionFactor);
saturation = glm::mix(1.0f, mUnfocusedItemSaturation, mTransitionFactor);
dimming = glm::mix(1.0f, mUnfocusedItemDimming, mTransitionFactor);
} }
if (cursorEntry && mSelectorLayer == SelectorLayer::BOTTOM) if (cursorEntry && mSelectorLayer == SelectorLayer::BOTTOM)
@ -760,6 +772,10 @@ template <typename T> void GridComponent<T>::render(const glm::mat4& parentTrans
mBackgroundImage->setPosition(mEntries.at(*it).data.item->getPosition()); mBackgroundImage->setPosition(mEntries.at(*it).data.item->getPosition());
mBackgroundImage->setScale(scale); mBackgroundImage->setScale(scale);
mBackgroundImage->setOpacity(opacity); mBackgroundImage->setOpacity(opacity);
if (mUnfocusedItemSaturation != 1.0f)
mBackgroundImage->setSaturation(saturation);
if (mUnfocusedItemDimming != 1.0f)
mBackgroundImage->setDimming(dimming);
mBackgroundImage->render(trans); mBackgroundImage->render(trans);
} }
else if (mHasBackgroundColor) { else if (mHasBackgroundColor) {
@ -790,6 +806,10 @@ template <typename T> void GridComponent<T>::render(const glm::mat4& parentTrans
mEntries.at(*it).data.item->setScale(scale); mEntries.at(*it).data.item->setScale(scale);
mEntries.at(*it).data.item->setOpacity(opacity); mEntries.at(*it).data.item->setOpacity(opacity);
if (mUnfocusedItemSaturation != 1.0f)
mEntries.at(*it).data.item->setSaturation(saturation);
if (mUnfocusedItemDimming != 1.0f)
mEntries.at(*it).data.item->setDimming(dimming);
if (cursorEntry && (mHasTextSelectedColor || mHasImageSelectedColor)) { if (cursorEntry && (mHasTextSelectedColor || mHasImageSelectedColor)) {
if (mHasTextSelectedColor && mEntries.at(*it).data.imagePath == "" && if (mHasTextSelectedColor && mEntries.at(*it).data.imagePath == "" &&
mEntries.at(*it).data.defaultImagePath == "") { mEntries.at(*it).data.defaultImagePath == "") {
@ -1197,6 +1217,13 @@ void GridComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
if (elem->has("unfocusedItemOpacity")) if (elem->has("unfocusedItemOpacity"))
mUnfocusedItemOpacity = glm::clamp(elem->get<float>("unfocusedItemOpacity"), 0.1f, 1.0f); mUnfocusedItemOpacity = glm::clamp(elem->get<float>("unfocusedItemOpacity"), 0.1f, 1.0f);
if (elem->has("unfocusedItemSaturation"))
mUnfocusedItemSaturation =
glm::clamp(elem->get<float>("unfocusedItemSaturation"), 0.0f, 1.0f);
if (elem->has("unfocusedItemDimming"))
mUnfocusedItemDimming = glm::clamp(elem->get<float>("unfocusedItemDimming"), 0.0f, 1.0f);
mFont = Font::getFromTheme(elem, properties, mFont, 0.0f, (mItemScale > 1.0f)); mFont = Font::getFromTheme(elem, properties, mFont, 0.0f, (mItemScale > 1.0f));
if (elem->has("textRelativeScale")) if (elem->has("textRelativeScale"))