1.0.3

Author: Zilko

changelog.md

@@ -1,3 +1,8 @@
+# 1.0.3
+
+* Fix bug in garage layer
+* Fix possible incompat
+
 # 1.0.2
 
 * Fix bug

mod.json

@@ -18,7 +18,7 @@
 		"bugfix"
 	],
 	"name": "Clickable Dots",
-	"version": "v1.0.2",
+	"version": "v1.0.3",
 	"developer": "Zilko",
 	"description": "Lets you click these page dots",
 	"settings": {

src/main.cpp

@@ -5,9 +5,13 @@ using namespace geode::prelude;
 class $modify(ProBoomScrollLayer, BoomScrollLayer) {
 
     struct Fields {
+        std::vector<CCMenuItemSpriteExtra*> m_buttonsArray;
         std::unordered_map<CCSprite*, CCMenuItemSpriteExtra*> m_buttons;
 
         int m_currentPage = 0;
+
+        bool m_check = false;
+        bool m_disable = false;
     };
 
     void onDot(CCObject* sender) {
@@ -25,10 +29,21 @@ class $modify(ProBoomScrollLayer, BoomScrollLayer) {
     }
 
     void updateButtons() {
-        if (Mod::get()->getSettingValue<bool>("disable")) return;
+        auto f = m_fields.self();
+
+        if (Mod::get()->getSettingValue<bool>("disable") || f->m_disable) return;
+        if (getParent() && !f->m_check) {
+            f->m_check = true;
+
+            if (typeinfo_cast<ListButtonBar*>(getParent()))
+                f->m_disable = true;
+        }
 
         CCArrayExt<CCSprite*> dots = CCArrayExt<CCSprite*>(m_dots);
 
+        if (static_cast<int>(dots.size()) != static_cast<int>(f->m_buttonsArray.size()))
+            addButtons();
+
         if (dots.size() <= 0) return;
 
         if (dots[0]->getPosition().x < 0 && Mod::get()->getSettingValue<bool>("fix-position")) {
@@ -42,8 +57,6 @@ class $modify(ProBoomScrollLayer, BoomScrollLayer) {
                 dots[i]->setPositionX(startX + i * spacing);
         }
 
-        auto f = m_fields.self();
-
         int page = 0;
 
         for (CCSprite* dot : dots) {
@@ -54,6 +67,11 @@ class $modify(ProBoomScrollLayer, BoomScrollLayer) {
             CCMenuItemSpriteExtra* btn = f->m_buttons.at(dot);
             CCSprite* spr = static_cast<CCSprite*>(btn->getNormalImage());
 
+            if (f->m_disable) {
+                btn->setVisible(false);
+                continue;
+            }
+
             btn->setPosition(dot->getPosition());
             spr->setScale(dot->getScale());
             spr->setColor(dot->getColor());
@@ -65,6 +83,29 @@ class $modify(ProBoomScrollLayer, BoomScrollLayer) {
         }
     }
 
+    void addButtons() {
+        auto f = m_fields.self();
+        CCNode* menu = getChildByID("buttons-menu"_spr);
+
+        for (CCMenuItemSpriteExtra* btn : f->m_buttonsArray)
+            btn->removeFromParentAndCleanup(true);
+
+        f->m_buttonsArray.clear();
+        f->m_buttons.clear();
+
+        int i = 0;
+
+        for (CCSprite* dot : CCArrayExt<CCSprite*>(m_dots)) {
+            CCMenuItemSpriteExtra* btn = CCMenuItemSpriteExtra::create(CCSprite::create("smallDot.png"), this, menu_selector(ProBoomScrollLayer::onDot));
+            btn->setTag(i++);
+
+            menu->addChild(btn);
+
+            f->m_buttons[dot] = btn;
+            f->m_buttonsArray.push_back(btn);
+        }
+    }
+
     void updateDots(float dt) {
         BoomScrollLayer::updateDots(dt);
 
@@ -84,16 +125,7 @@ class $modify(ProBoomScrollLayer, BoomScrollLayer) {
 
         addChild(menu);
 
-        int i = 0;
-
-        for (CCSprite* dot : CCArrayExt<CCSprite*>(m_dots)) {
-            CCMenuItemSpriteExtra* btn = CCMenuItemSpriteExtra::create(CCSprite::create("smallDot.png"), this, menu_selector(ProBoomScrollLayer::onDot));
-            btn->setTag(i++);
-
-            menu->addChild(btn);
-
-            f->m_buttons[dot] = btn;
-        }
+        addButtons();
 
         return true;
     }