Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 14:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '652-allow-system-placeholders-to-be-a-combination-of-text-and-image-make-text-and-image-customizable' into 575-theme-add-a-modern-clean-switch-like-theme-as-an-official-theme-in-es-de-to-choose-from

Browse source
This commit is contained in:
Sophia Hadash 2021-10-12 21:35:47 +02:00
parent 5623dda1d3 716aa3df4a
commit 12239b907d
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,7 +68,7 @@ void SystemView::populate()
e.name = (*it)->getName();
e.object = *it;
// Component offset.
// Component offset. Used for positioning placeholders.
glm::vec3 offsetLogo = {0.0f, 0.0f, 0.0f};
glm::vec3 offsetLogoPlaceholderText = {0.0f, 0.0f, 0.0f};
@ -89,13 +89,12 @@ void SystemView::populate()
}
}
// No logo available? Make placeholder.
if (!e.data.logo) {
// No logo in theme; use placeholder.
glm::vec2 resolution = glm::vec2{static_cast<float>(Renderer::getScreenWidth()),
static_cast<float>(Renderer::getScreenHeight())};
glm::vec3 center = {resolution.x / 2.0f, resolution.y / 2.0f, 1.0f};
glm::vec2 scale{getParent() ? getParent()->getSize() : resolution};
// Placeholder Image.
const ThemeData::ThemeElement* logoElem =
@ -190,7 +189,7 @@ void SystemView::populate()
e.data.logo->setPosition(v + offsetLogo);
if (e.data.logoPlaceholderText)
e.data.logoPlaceholderText->setPosition(
v + offsetLogoPlaceholderText); // e.data.logo->getPosition() +
v + offsetLogoPlaceholderText);
// Make background extras.
e.data.backgroundExtras = ThemeData::makeExtras((*it)->getTheme(), "system", mWindow);