7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

MenuLayer: prevent update and error icon overlap

Browse source
This commit is contained in:
Fleeym 2024-06-03 18:56:58 +03:00
parent 4e1721a6ef
commit 7087767d3e
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
loader/src/hooks/MenuLayer.cpp
View file

@ -81,8 +81,10 @@ struct CustomMenuLayer : Modify<CustomMenuLayer, MenuLayer> {
}
}
bool hasErrors = false;
// show if some mods failed to load
if (Loader::get()->getProblems().size()) {
hasErrors = true;
static bool shownProblemPopup = false;
if (!shownProblemPopup) {
shownProblemPopup = true;
@ -161,20 +163,23 @@ struct CustomMenuLayer : Modify<CustomMenuLayer, MenuLayer> {
// Check for mod updates
m_fields->m_updateCheckTask = ModsLayer::checkInstalledModsForUpdates().map(
[this](server::ServerRequest<std::vector<std::string>>::Value* result) {
[this, hasErrors](server::ServerRequest<std::vector<std::string>>::Value* result) {
if (result->isOk()) {
auto updatesFound = result->unwrap();
if (updatesFound.size() && !m_fields->m_geodeButton->getChildByID("updates-available")) {
log::info("Found updates for mods: {}!", updatesFound);
auto icon = CCSprite::createWithSpriteFrameName("updates-available.png"_spr);
icon->setPosition(
m_fields->m_geodeButton->getContentSize() - CCSize { 10.f, 10.f }
);
icon->setID("updates-available");
icon->setZOrder(99);
icon->setScale(.5f);
m_fields->m_geodeButton->addChild(icon);
// Only show the icon if the errors icon wasn't added already, to prevent overlap
if (!hasErrors) {
auto icon = CCSprite::createWithSpriteFrameName("updates-available.png"_spr);
icon->setPosition(
m_fields->m_geodeButton->getContentSize() - CCSize { 10.f, 10.f }
);
icon->setID("updates-available");
icon->setZOrder(99);
icon->setScale(.5f);
m_fields->m_geodeButton->addChild(icon);
}
}
else {
log::error("No updates found :(");