allow collapsing titles

loader/include/Geode/loader/SettingV3.hpp

@@ -653,7 +653,7 @@ namespace geode {
             
             m_impl = std::make_shared<Impl>();
             m_impl->currentValue = setting->getValue();
-            
+
             return true;
         }
 

loader/src/loader/SettingNodeV3.cpp

@@ -222,6 +222,30 @@ bool TitleSettingNodeV3::init(std::shared_ptr<TitleSettingV3> setting, float wid
     if (!SettingNodeV3::init(setting, width))
         return false;
     
+    auto collapseSprBG = CCSprite::create("square02c_001.png");
+    collapseSprBG->setColor(ccc3(25, 25, 25));
+    collapseSprBG->setOpacity(105);
+    auto collapseSpr = CCSprite::createWithSpriteFrameName("edit_downBtn_001.png");
+    collapseSpr->setScale(1.9f);
+    collapseSprBG->addChildAtPosition(collapseSpr, Anchor::Center);
+    collapseSprBG->setScale(.2f);
+
+    auto uncollapseSprBG = CCSprite::create("square02c_001.png");
+    uncollapseSprBG->setColor(ccc3(25, 25, 25));
+    uncollapseSprBG->setOpacity(105);
+    auto uncollapseSpr = CCSprite::createWithSpriteFrameName("edit_delCBtn_001.png");
+    uncollapseSpr->setScale(1.5f);
+    uncollapseSprBG->addChildAtPosition(uncollapseSpr, Anchor::Center);
+    uncollapseSprBG->setScale(.2f);
+    
+    m_collapseToggle = CCMenuItemToggler::create(
+        collapseSprBG, uncollapseSprBG,
+        this, menu_selector(TitleSettingNodeV3::onCollapse)
+    );
+    m_collapseToggle->m_notClickable = true;
+    this->getButtonMenu()->setContentWidth(20);
+    this->getButtonMenu()->addChildAtPosition(m_collapseToggle, Anchor::Center);
+    
     this->getNameLabel()->setFntFile("goldFont.fnt");
     this->getNameMenu()->updateLayout();
     this->setContentHeight(20);
@@ -230,8 +254,17 @@ bool TitleSettingNodeV3::init(std::shared_ptr<TitleSettingV3> setting, float wid
     return true;
 }
 
+void TitleSettingNodeV3::onCollapse(CCObject* sender) {
+    m_collapseToggle->toggle(!m_collapseToggle->isToggled());
+    // This triggers popup state to update due to SettingNodeValueChangeEventV3 being posted
+    this->markChanged(static_cast<CCNode*>(sender));
+}
 void TitleSettingNodeV3::onCommit() {}
 
+bool TitleSettingNodeV3::isCollapsed() const {
+    return m_collapseToggle->isToggled();
+}
+
 bool TitleSettingNodeV3::hasUncommittedChanges() const {
     return false;
 }

loader/src/loader/SettingNodeV3.hpp

@@ -13,12 +13,17 @@ using namespace geode::prelude;
 
 class TitleSettingNodeV3 : public SettingNodeV3 {
 protected:
+    CCMenuItemToggler* m_collapseToggle;
+
     bool init(std::shared_ptr<TitleSettingV3> setting, float width);
 
     void onCommit() override;
+    void onCollapse(CCObject*);
 
 public:
     static TitleSettingNodeV3* create(std::shared_ptr<TitleSettingV3> setting, float width);
+
+    bool isCollapsed() const;
     
     bool hasUncommittedChanges() const override;
     bool hasNonDefaultValue() const override;

loader/src/ui/mods/settings/ModSettingsPopup.cpp

@@ -75,10 +75,7 @@ bool ModSettingsPopup::setup(Mod* mod) {
     m_list = ScrollLayer::create(layerSize - ccp(0, searchContainer->getContentHeight()));
     m_list->setTouchEnabled(true);
 
-    bool bg = false;
     for (auto& key : mod->getSettingKeys()) {
-        bg = !bg;
-
         SettingNodeV3* node;
         if (auto sett = mod->getSettingV3(key)) {
             node = sett->createNode(layerSize.width);
@@ -86,7 +83,6 @@ bool ModSettingsPopup::setup(Mod* mod) {
         else {
             node = UnresolvedCustomSettingNodeV3::create(key, mod, layerSize.width);
         }
-        node->setDefaultBGColor(ccc4(0, 0, 0, bg ? 60 : 20));
     
         // auto separator = CCLayerColor::create({ 0, 0, 0, 50 }, layerSize.width, 1.f);
         // separator->setOpacity(bg ? 100 : 50);
@@ -248,11 +244,27 @@ void ModSettingsPopup::updateState(SettingNodeV3* invoker) {
     m_openConfigDirBtnSpr->setColor(configDirExists ? ccWHITE : ccGRAY);
     m_openConfigDirBtnSpr->setOpacity(configDirExists ? 255 : 155);
 
-    // Update search visibility + all settings with "enable-if" schemes
+    auto listPosBefore = m_list->m_contentLayer->getPositionY();
+    auto listHeightBefore = m_list->m_contentLayer->getContentHeight();
+
+    // Update search visibility + all settings with "enable-if" schemes + 
+    // checkerboard BG
+    TitleSettingNodeV3* lastTitle = nullptr;
+    bool bg = false;
     for (auto& sett : m_settings) {
+        if (auto asTitle = typeinfo_cast<TitleSettingNodeV3*>(sett.data())) {
+            lastTitle = asTitle;
+        }
         sett->removeFromParent();
-        if (!hasSearch || matchSearch(sett, search)) {
+        if (
+            // Show if the setting is not a title and is not subject to a collapsed title
+            !(lastTitle && lastTitle != sett && lastTitle->isCollapsed()) &&
+            // Show if there's no search query or if the setting matches it
+            (!hasSearch || matchSearch(sett, search))
+        ) {
             m_list->m_contentLayer->addChild(sett);
+            sett->setDefaultBGColor(ccc4(0, 0, 0, bg ? 60 : 20));
+            bg = !bg;
         }
         // Avoid infinite loops
         if (sett == invoker) {
@@ -264,6 +276,12 @@ void ModSettingsPopup::updateState(SettingNodeV3* invoker) {
     }
     m_list->m_contentLayer->updateLayout();
 
+    // Preserve relative list position if something has been collapsed
+    m_list->m_contentLayer->setPositionY(
+        listPosBefore + 
+            (listHeightBefore - m_list->m_contentLayer->getContentHeight())
+    );
+
     m_applyBtnSpr->setCascadeColorEnabled(true);
     m_applyBtnSpr->setCascadeOpacityEnabled(true);
     if (this->hasUncommitted()) {