From d508a123d2e83c894405af0c172555a942ee4fe5 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 4 Jun 2022 17:31:51 +0200 Subject: [PATCH] Fixed a few logoText issues for legacy themes. --- es-app/src/views/GamelistLegacy.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/es-app/src/views/GamelistLegacy.h b/es-app/src/views/GamelistLegacy.h index a948f7366..324e7df99 100644 --- a/es-app/src/views/GamelistLegacy.h +++ b/es-app/src/views/GamelistLegacy.h @@ -25,9 +25,9 @@ void GamelistView::legacyPopulateFields() mTextComponents.back()->setSize(mSize.x, 0.0f); mTextComponents.back()->setPosition(0.0f, 0.0f); mTextComponents.back()->setHorizontalAlignment(ALIGN_CENTER); - mTextComponents.back()->setColor(0xFFFFFFFF); + mTextComponents.back()->setColor(0x000000FF); mTextComponents.back()->setDefaultZIndex(50.0f); - mTextComponents.back()->setVisible(false); + mTextComponents.back()->setZIndex(10.0f); addChild(mTextComponents.back().get()); // Logo. @@ -227,8 +227,8 @@ void GamelistView::legacyOnThemeChanged(const std::shared_ptr& theme) mImageComponents[LOGO]->applyTheme(theme, getName(), "image_logo", ALL); mImageComponents[BACKGROUND]->applyTheme(theme, getName(), "image_background", ALL); - // Make sure we don't display both the logo and logo text. - if (mImageComponents[LOGO]->getTexture() != nullptr) + // Make sure we don't display both the logo image and logo text. + if (mImageComponents[LOGO]->hasImage()) mTextComponents[LOGOTEXT]->setVisible(false); // Remove old theme extras. @@ -320,8 +320,6 @@ void GamelistView::legacyOnThemeChanged(const std::shared_ptr& theme) // Hide some components if we're in Basic mode. if (mViewStyle == ViewController::BASIC) { - if (mTheme->getElement(getName(), "text_logoText", "text") == nullptr) - mTextComponents[LegacyText::LOGOTEXT]->setVisible(false); mImageComponents[LegacyImage::MD_IMAGE]->setVisible(false); for (auto& container : mContainerComponents) container->setVisible(false);