Fix clickable dots

Author: Alphalaneous

changelog.md

@@ -1,3 +1,6 @@
+# 2.1.4
+- Fix incompat with Clickable Dots in the editor
+
 # 2.1.3
 - Hotfix for BetterEdit Edit Menu breaking
 

mod.json

@@ -1,12 +1,12 @@
 {
-	"geode": "5.5.3",
+	"geode": "5.6.0",
 	"gd": {
 		"win": "2.2081",	
 		"mac": "2.2081",	
 		"android": "2.2081",
 		"ios": "2.2081"
 	},
-	"version": "v2.1.3",
+	"version": "v2.1.4",
 	"id": "alphalaneous.editortab_api",
 	"name": "EditorTab API",
 	"developer": "Alphalaneous",

src/EditButtonBar.cpp

@@ -1,5 +1,6 @@
 #include "EditButtonBar.hpp"
 #include "EditorUI.hpp"
+#include <Geode/ui/Button.hpp>
 
 EditButtonBar* ETEditButtonBar::create(cocos2d::CCArray* objects, cocos2d::CCPoint position, int tab, bool hasCreateItems, int columns, int rows) {
     auto ret = EditButtonBar::create(objects, position, tab, hasCreateItems, columns, rows);
@@ -33,6 +34,11 @@ void ETEditButtonBar::setupChanges(int c, int r) {
     m_scrollLayer->setPosition(getContentSize() / 2);
     m_scrollLayer->unscheduleUpdate();
     m_scrollLayer->unschedule(schedule_selector(BoomScrollLayer::updateDots));
+
+    auto clickableDotsMenu = m_scrollLayer->getChildByID("zilko.clickable_dots/buttons-menu");
+    if (clickableDotsMenu) {
+        clickableDotsMenu->setVisible(false);
+    }
 
     for (auto page : m_scrollLayer->m_pages->asExt<ButtonPage>()) {
         page->setContentSize(getContentSize());
@@ -81,18 +87,32 @@ void ETEditButtonBar::setupChanges(int c, int r) {
 
     auto count = m_pagesArray ? m_pagesArray->count() : 1;
 
-    fields->m_dots = CCSpriteBatchNode::create("smallDot.png", count);
+    fields->m_dots = CCNode::create();
     fields->m_dots->setAnchorPoint({0.5f, 0.f});
     fields->m_dots->setContentSize({getContentWidth(), 5.f});
-    fields->m_dots->setPositionX(getContentWidth() / 2);
+    fields->m_dots->setPosition({getContentWidth() / 2, 0});
     fields->m_dots->setID("dots"_spr);
 
     addChild(fields->m_dots);
 
     for (int i = 0; i < count; i++) {
         auto spr = CCSprite::create("smallDot.png");
         spr->setScale(0.5f);
-        fields->m_dots->addChild(spr);
+
+        if (clickableDotsMenu) {
+            auto btn = geode::Button::createWithNode(spr, [this] (auto sender) {
+                goToPage(sender->getTag());
+            });
+            btn->setCascadeColorEnabled(true);
+            btn->setCascadeOpacityEnabled(true);
+            btn->setTag(i);
+            btn->setZOrder(i);
+
+            fields->m_dots->addChild(btn);
+        }
+        else {
+            fields->m_dots->addChild(spr);
+        }
     } 
 
     if (spacerLeft && spacerRight) {
@@ -122,7 +142,7 @@ void ETEditButtonBar::updatePage() {
     auto fields = m_fields.self();
     if (!fields->m_dots) return;
 
-    auto arr = fields->m_dots->getChildrenExt<CCSprite>();
+    auto arr = fields->m_dots->getChildrenExt<CCNodeRGBA>();
 
     if (arr.empty()) return;
 

src/EditButtonBar.hpp

@@ -8,7 +8,7 @@ using namespace geode::prelude;
 
 class $modify(ETEditButtonBar, EditButtonBar) {
     struct Fields {
-        CCSpriteBatchNode* m_dots;
+        CCNode* m_dots;
     };
 
     static void onModify(auto& self) {