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

Fixed an issue with rendering elements above the carousel for legacy theme sets.

Browse source
This commit is contained in:
Leon Styhre 2022-06-03 19:34:39 +02:00
parent b12d9f4692
commit 846b0a07ef
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
es-app/src/views/SystemView.cpp
View file

@ -164,8 +164,7 @@ void SystemView::render(const glm::mat4& parentTrans)
mPrimary->render(trans); mPrimary->render(trans);
// For legacy themes the carousel is always rendered on top of all other elements. if (!fade || mLegacyMode)
if (!mLegacyMode && !fade)
renderElements(parentTrans, true); renderElements(parentTrans, true);
} }
@ -1206,7 +1205,10 @@ void SystemView::renderElements(const glm::mat4& parentTrans, bool abovePrimary)
if (mLegacyMode && mSystemElements.size() > static_cast<size_t>(index)) { if (mLegacyMode && mSystemElements.size() > static_cast<size_t>(index)) {
for (auto element : mSystemElements[index].legacyExtras) { for (auto element : mSystemElements[index].legacyExtras) {
if (mFadeTransitions || element->getDimming() != 1.0f) if (abovePrimary && element->getZIndex() < primaryZIndex)
continue;
if ((mFadeTransitions || element->getDimming() != 1.0f) &&
element->getZIndex() < primaryZIndex)
element->setDimming(1.0f - mFadeOpacity); element->setDimming(1.0f - mFadeOpacity);
element->render(elementTrans); element->render(elementTrans);
} }
@ -1226,7 +1228,7 @@ void SystemView::renderElements(const glm::mat4& parentTrans, bool abovePrimary)
} }
} }
if (mLegacyMode) { if (mLegacyMode && !abovePrimary) {
if (mFadeTransitions) if (mFadeTransitions)
mLegacySystemInfo->setDimming(1.0f - mFadeOpacity); mLegacySystemInfo->setDimming(1.0f - mFadeOpacity);
mLegacySystemInfo->render(elementTrans); mLegacySystemInfo->render(elementTrans);