From fa62b8813e9d5180cd68fa4b5ab3f57aa3d7b29d Mon Sep 17 00:00:00 2001 From: HJfod <60038575+HJfod@users.noreply.github.com> Date: Sat, 23 Mar 2024 19:42:35 +0200 Subject: [PATCH] add versions to mod list items --- loader/src/ui/mods/list/ModItem.cpp | 23 ++++++++++++++++------- loader/src/ui/mods/list/ModItem.hpp | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/loader/src/ui/mods/list/ModItem.cpp b/loader/src/ui/mods/list/ModItem.cpp index c2da4356..886a4408 100644 --- a/loader/src/ui/mods/list/ModItem.cpp +++ b/loader/src/ui/mods/list/ModItem.cpp @@ -36,16 +36,22 @@ bool ModItem::init(ModSource&& source) { m_titleContainer->setAnchorPoint({ .0f, .5f }); m_titleContainer->setLayout( RowLayout::create() + ->setDefaultScaleLimits(.1f, 1.f) ->setAxisAlignment(AxisAlignment::Start) ); m_titleLabel = CCLabelBMFont::create(m_source.getMetadata().getName().c_str(), "bigFont.fnt"); - m_titleLabel->setAnchorPoint({ .0f, .5f }); - m_titleLabel->setLayoutOptions( - AxisLayoutOptions::create() - ->setMinScale(.1f) - ); m_titleContainer->addChild(m_titleLabel); + + m_versionLabel = CCLabelBMFont::create(m_source.getMetadata().getVersion().toString().c_str(), "bigFont.fnt"); + m_versionLabel->setColor( + ColorProvider::get()->define("mod-list-version-label"_spr, ccc3(86, 235, 41)) + ); + m_versionLabel->setLayoutOptions( + AxisLayoutOptions::create() + ->setMaxScale(.7f) + ); + m_titleContainer->addChild(m_versionLabel); m_infoContainer->addChild(m_titleContainer); @@ -67,9 +73,11 @@ bool ModItem::init(ModSource&& source) { m_infoContainer->addChild(m_developers); m_restartRequiredLabel = ButtonSprite::create("Restart Required", "bigFont.fnt", "white-square.png"_spr, .8f); - m_restartRequiredLabel->m_label->setColor({ 153, 245, 245 }); + m_restartRequiredLabel->m_label->setColor( + ColorProvider::get()->define("mod-list-restart-required-label"_spr, ccc3(153, 245, 245)) + ); m_restartRequiredLabel->m_BGSprite->setColor( - ColorProvider::get()->define("mod-list-label-bg"_spr, ccc3(123, 156, 163)) + ColorProvider::get()->define("mod-list-restart-required-label-bg"_spr, ccc3(123, 156, 163)) ); m_restartRequiredLabel->setLayoutOptions( AxisLayoutOptions::create() @@ -144,6 +152,7 @@ void ModItem::updateState() { m_bg->setColor({ 255, 255, 255 }); m_bg->setOpacity(mod->isOrWillBeEnabled() ? 25 : 10); m_titleLabel->setOpacity(mod->isOrWillBeEnabled() ? 255 : 155); + m_versionLabel->setOpacity(mod->isOrWillBeEnabled() ? 255 : 155); m_developerLabel->setOpacity(mod->isOrWillBeEnabled() ? 255 : 155); }, [this](server::ServerModMetadata const& metadata) { diff --git a/loader/src/ui/mods/list/ModItem.hpp b/loader/src/ui/mods/list/ModItem.hpp index defd36a0..228cca01 100644 --- a/loader/src/ui/mods/list/ModItem.hpp +++ b/loader/src/ui/mods/list/ModItem.hpp @@ -14,6 +14,7 @@ protected: CCNode* m_infoContainer; CCNode* m_titleContainer; CCLabelBMFont* m_titleLabel; + CCLabelBMFont* m_versionLabel; CCNode* m_developers; CCLabelBMFont* m_developerLabel; ButtonSprite* m_restartRequiredLabel = nullptr;