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

Implemented a proper solution for the carousel logo alignment issue.

Browse source
This commit is contained in:
Leon Styhre 2021-11-09 22:13:58 +01:00
parent ccd8e29b37
commit c4b574f571
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,7 +81,7 @@ void SystemView::populate()
(!defaultPath.empty() && (!defaultPath.empty() &&
ResourceManager::getInstance()->fileExists(defaultPath))) { ResourceManager::getInstance()->fileExists(defaultPath))) {
auto* logo = new ImageComponent(mWindow, false, false); auto* logo = new ImageComponent(mWindow, false, false);
logo->setMaxSize(mCarousel.logoSize * mCarousel.logoScale); logo->setMaxSize(glm::round(mCarousel.logoSize * mCarousel.logoScale));
logo->applyTheme(theme, "system", "logo", ThemeFlags::PATH | ThemeFlags::COLOR); logo->applyTheme(theme, "system", "logo", ThemeFlags::PATH | ThemeFlags::COLOR);
logo->setRotateByTargetSize(true); logo->setRotateByTargetSize(true);
e.data.logo = std::shared_ptr<GuiComponent>(logo); e.data.logo = std::shared_ptr<GuiComponent>(logo);
@ -603,7 +603,8 @@ void SystemView::renderCarousel(const glm::mat4& trans)
break; break;
} }
case HORIZONTAL_WHEEL: { case HORIZONTAL_WHEEL: {
xOff = (mCarousel.size.x - mCarousel.logoSize.x) / 2.0f - (mCamOffset * logoSpacing.y); xOff = std::round((mCarousel.size.x - mCarousel.logoSize.x) / 2.0f -
(mCamOffset * logoSpacing.y));
if (mCarousel.logoAlignment == ALIGN_TOP) if (mCarousel.logoAlignment == ALIGN_TOP)
yOff = mCarousel.logoSize.y / 10.0f; yOff = mCarousel.logoSize.y / 10.0f;
else if (mCarousel.logoAlignment == ALIGN_BOTTOM) else if (mCarousel.logoAlignment == ALIGN_BOTTOM)
@ -618,7 +619,8 @@ void SystemView::renderCarousel(const glm::mat4& trans)
logoSpacing.x = ((mCarousel.size.x - (mCarousel.logoSize.x * mCarousel.maxLogoCount)) / logoSpacing.x = ((mCarousel.size.x - (mCarousel.logoSize.x * mCarousel.maxLogoCount)) /
(mCarousel.maxLogoCount)) + (mCarousel.maxLogoCount)) +
mCarousel.logoSize.x; mCarousel.logoSize.x;
xOff = (mCarousel.size.x - mCarousel.logoSize.x) / 2.0f - (mCamOffset * logoSpacing.x); xOff = std::round((mCarousel.size.x - mCarousel.logoSize.x) / 2.0f -
(mCamOffset * logoSpacing.x));
if (mCarousel.logoAlignment == ALIGN_TOP) if (mCarousel.logoAlignment == ALIGN_TOP)
yOff = mCarousel.logoSize.y / 10.0f; yOff = mCarousel.logoSize.y / 10.0f;
else if (mCarousel.logoAlignment == ALIGN_BOTTOM) else if (mCarousel.logoAlignment == ALIGN_BOTTOM)
@ -669,12 +671,16 @@ void SystemView::renderCarousel(const glm::mat4& trans)
comp->setRotationDegrees(mCarousel.logoRotation * distance); comp->setRotationDegrees(mCarousel.logoRotation * distance);
comp->setRotationOrigin(mCarousel.logoRotationOrigin); comp->setRotationOrigin(mCarousel.logoRotationOrigin);
} }
comp->setScale(scale);
// Partial workaround for single-pixel alignment issues at some resolutions and with
// some logos.
comp->setSize(comp->getSize().x, std::ceil(comp->getSize().y));
comp->setPosition(comp->getPosition().x, std::round(comp->getPosition().y));
// When running at lower resolutions, prevent the scale-down to go all the way to the
// minimum value. This avoids potential single-pixel alignment issues when the logo
// can't be vertically placed exactly in the middle of the carousel. Although the
// problem theoretically exists at all resolutions, it's not visble at around 1080p
// and above.
if (std::min(mSize.x, mSize.y) < 1080.0f)
scale = glm::clamp(scale, 1.0f / mCarousel.logoScale + 0.01f, 1.0f);
comp->setScale(scale);
comp->setOpacity(static_cast<unsigned char>(opacity)); comp->setOpacity(static_cast<unsigned char>(opacity));
comp->render(logoTrans); comp->render(logoTrans);