From 54ac66ef7c9c1a89260bf69d87ec23bd6fd8d930 Mon Sep 17 00:00:00 2001 From: HJfod <60038575+HJfod@users.noreply.github.com> Date: Wed, 28 Feb 2024 00:27:43 +0200 Subject: [PATCH] use new awesome ColorProvider utility --- loader/src/ui/mods/ModList.cpp | 9 +++++++-- loader/src/ui/mods/ModsLayer.cpp | 7 ++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/loader/src/ui/mods/ModList.cpp b/loader/src/ui/mods/ModList.cpp index b05ee182..dd16eb83 100644 --- a/loader/src/ui/mods/ModList.cpp +++ b/loader/src/ui/mods/ModList.cpp @@ -1,5 +1,6 @@ #include "ModList.hpp" #include +#include bool ModList::init(ModListSource* src, CCSize const& size) { if (!CCNode::init()) @@ -26,7 +27,9 @@ bool ModList::init(ModListSource* src, CCSize const& size) { m_searchMenu->setContentSize({ size.width, 30 }); m_searchMenu->setAnchorPoint({ .5f, 1.f }); - auto searchBG = CCLayerColor::create({ 83, 65, 109, 255 }); + auto searchBG = CCLayerColor::create( + ColorProvider::get()->define("mod-list-search-bg"_spr, { 83, 65, 109, 255 }) + ); searchBG->setContentSize(m_searchMenu->getContentSize()); searchBG->ignoreAnchorPointForPosition(false); m_searchMenu->addChildAtPosition(searchBG, Anchor::Center); @@ -136,7 +139,9 @@ void ModList::onPromise(typename ModListSource::PageLoadEvent* event) { for (auto item : *resolved) { // Add separators between items after the first one if (!first) { - auto separator = CCLayerColor::create({ 255, 255, 255, 45 }); + auto separator = CCLayerColor::create( + ColorProvider::get()->define("mod-list-separator"_spr, { 255, 255, 255, 45 }) + ); separator->setContentSize({ m_obContentSize.width - 10, .5f }); m_list->m_contentLayer->addChild(separator); } diff --git a/loader/src/ui/mods/ModsLayer.cpp b/loader/src/ui/mods/ModsLayer.cpp index 9d161d89..ff89427c 100644 --- a/loader/src/ui/mods/ModsLayer.cpp +++ b/loader/src/ui/mods/ModsLayer.cpp @@ -1,8 +1,7 @@ #include "ModsLayer.hpp" #include "SwelvyBG.hpp" #include - -static bool BIG_VIEW = false; +#include bool ModsLayer::init() { if (!CCLayer::init()) @@ -54,7 +53,9 @@ bool ModsLayer::init() { m_frame->setAnchorPoint({ .5f, .5f }); m_frame->setContentSize({ 380, 205 }); - auto frameBG = CCLayerColor::create({ 25, 17, 37, 255 }); + auto frameBG = CCLayerColor::create( + ColorProvider::get()->define("mod-list-bg"_spr, { 25, 17, 37, 255 }) + ); frameBG->setContentSize(m_frame->getContentSize()); frameBG->ignoreAnchorPointForPosition(false); m_frame->addChildAtPosition(frameBG, Anchor::Center);