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

fix ModPopup::updateState behaviour with the enable button

Browse source
This commit is contained in:
HJfod 2024-03-24 21:31:42 +02:00
parent 8b23be8d81
commit a4685a50e1
5 changed files with 61 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
loader/include/Geode/loader/Mod.hpp
View file

@ -41,6 +41,13 @@ namespace geode {
UninstallWithSaveData
};
static constexpr bool modRequestedActionIsToggle(ModRequestedAction action) {
return action == ModRequestedAction::Enable || action == ModRequestedAction::Disable;
}
static constexpr bool modRequestedActionIsUninstall(ModRequestedAction action) {
return action == ModRequestedAction::Uninstall || action == ModRequestedAction::UninstallWithSaveData;
}
GEODE_HIDDEN Mod* takeNextLoaderMod();
class ModImpl;

3
loader/include/Geode/ui/IconButtonSprite.hpp
View file

@ -39,5 +39,8 @@ namespace geode {
void setString(char const* label) override;
char const* getString() override;
void setColor(cocos2d::ccColor3B const& color) override;
void setOpacity(GLubyte opacity) override;
};
}

9
loader/src/loader/ModImpl.cpp
View file

@ -458,11 +458,7 @@ Result<> Mod::Impl::disable() {
Result<> Mod::Impl::uninstall(bool deleteSaveData) {
// Allow uninstalling if the mod has been disabled / enabled
if (
m_requestedAction != ModRequestedAction::None &&
m_requestedAction != ModRequestedAction::Enable &&
m_requestedAction != ModRequestedAction::Disable
) {
if (modRequestedActionIsUninstall(m_requestedAction)) {
return Err(humanReadableDescForAction(m_requestedAction));
}
@ -500,8 +496,7 @@ Result<> Mod::Impl::uninstall(bool deleteSaveData) {
}
bool Mod::Impl::isUninstalled() const {
return m_requestedAction == ModRequestedAction::Uninstall ||
m_requestedAction == ModRequestedAction::UninstallWithSaveData;
return modRequestedActionIsUninstall(m_requestedAction);
}
ModRequestedAction Mod::Impl::getRequestedAction() const {

60
loader/src/ui/mods/popups/ModPopup.cpp
View file

@ -249,13 +249,13 @@ bool ModPopup::setup(ModSource&& src) {
std::get<2>(stat),
std::get<3>(stat)
);
onSpr->setScale(.48f);
onSpr->setScale(.5f);
auto offSpr = createGeodeButton(
CCSprite::createWithSpriteFrameName(std::get<4>(stat)),
std::get<5>(stat),
std::get<6>(stat)
);
offSpr->setScale(.48f);
offSpr->setScale(.5f);
auto toggle = CCMenuItemToggler::create(offSpr, onSpr, this, std::get<7>(stat));
toggle->m_notClickable = true;
m_installMenu->addChild(toggle);
@ -408,36 +408,38 @@ bool ModPopup::setup(ModSource&& src) {
}
void ModPopup::updateState() {
if (auto mod = m_source.asMod()) {
m_enableBtn->toggle(mod->isOrWillBeEnabled());
m_enableBtn->setEnabled(true);
m_enableBtn->m_offButton->setOpacity(255);
m_enableBtn->m_onButton->setOpacity(255);
}
else {
m_enableBtn->setEnabled(false);
m_enableBtn->m_offButton->setOpacity(150);
m_enableBtn->m_onButton->setOpacity(150);
}
auto shouldEnableEnableBtn =
m_source.asMod() &&
!modRequestedActionIsUninstall(m_source.asMod()->getRequestedAction());
auto shouldEnableInstallBtn =
!modRequestedActionIsToggle(m_source.asMod()->getRequestedAction());
auto wantsRestart = m_source.wantsRestart();
if (m_source.wantsRestart()) {
m_installBG->setColor(to3B(ColorProvider::get()->color("mod-list-restart-required-label"_spr)));
m_installBG->setOpacity(40);
m_restartRequiredLabel->setVisible(true);
}
else {
m_installBG->setColor({ 0, 0, 0 });
m_installBG->setOpacity(75);
m_restartRequiredLabel->setVisible(false);
}
auto enableBtnOff = static_cast<IconButtonSprite*>(m_enableBtn->m_offButton->getNormalImage());
auto enableBtnOn = static_cast<IconButtonSprite*>(m_enableBtn->m_onButton->getNormalImage());
auto installBtnOff = static_cast<IconButtonSprite*>(m_installBtn->m_offButton->getNormalImage());
auto installBtnOn = static_cast<IconButtonSprite*>(m_installBtn->m_onButton->getNormalImage());
m_enableBtn->toggle(m_source.asMod() && m_source.asMod()->isOrWillBeEnabled());
m_enableBtn->setEnabled(shouldEnableEnableBtn);
enableBtnOff->setOpacity(shouldEnableEnableBtn ? 255 : 105);
enableBtnOff->setColor(shouldEnableEnableBtn ? ccc3(255, 255, 255) : ccc3(155, 155, 155));
enableBtnOn->setOpacity(shouldEnableEnableBtn ? 255 : 105);
enableBtnOn->setColor(shouldEnableEnableBtn ? ccc3(255, 255, 255) : ccc3(155, 155, 155));
// todo: uninstall just installed server mods
if (m_source.asMod() /* || m_source.asServer()->isInstalled() */) {
m_installBtn->toggle(
m_source.asMod()->getRequestedAction() == ModRequestedAction::Uninstall ||
m_source.asMod()->getRequestedAction() == ModRequestedAction::UninstallWithSaveData
);
}
m_installBtn->toggle(m_source.asMod() && modRequestedActionIsUninstall(m_source.asMod()->getRequestedAction()));
m_installBtn->setEnabled(shouldEnableInstallBtn);
installBtnOff->setOpacity(shouldEnableInstallBtn ? 255 : 105);
installBtnOff->setColor(shouldEnableInstallBtn ? ccc3(255, 255, 255) : ccc3(155, 155, 155));
installBtnOn->setOpacity(shouldEnableInstallBtn ? 255 : 105);
installBtnOn->setColor(shouldEnableInstallBtn ? ccc3(255, 255, 255) : ccc3(155, 155, 155));
m_installBG->setColor(wantsRestart ? to3B(ColorProvider::get()->color("mod-list-restart-required-label"_spr)) : ccc3(0, 0, 0));
m_installBG->setOpacity(wantsRestart ? 40 : 75);
m_restartRequiredLabel->setVisible(wantsRestart);
// Propagate update up the chain
if (m_updateParentState) {

18
loader/src/ui/nodes/IconButtonSprite.cpp
View file

@ -125,3 +125,21 @@ void IconButtonSprite::setString(char const* label) {
char const* IconButtonSprite::getString() {
return m_label->getString();
}
void IconButtonSprite::setColor(cocos2d::ccColor3B const& color) {
CCSprite::setColor(color);
m_bg->setColor(color);
m_label->setColor(color);
if (auto icon = typeinfo_cast<CCRGBAProtocol*>(m_icon)) {
icon->setColor(color);
}
}
void IconButtonSprite::setOpacity(GLubyte opacity) {
CCSprite::setOpacity(opacity);
m_bg->setOpacity(opacity);
m_label->setOpacity(opacity);
if (auto icon = typeinfo_cast<CCRGBAProtocol*>(m_icon)) {
icon->setOpacity(opacity);
}
}