Worked on Button Action Manager

Author: beproact

src/ButtonActionManager.hpp

@@ -0,0 +1,67 @@
+#pragma once
+#include <Geode/Geode.hpp>
+
+using namespace geode::prelude;
+
+class ButtonActionManager : CCObject {
+    static ButtonActionManager* instance;
+public:
+    static ButtonActionManager* get() {
+        if(!instance){
+            instance = new ButtonActionManager();
+            instance->retain();
+        }
+        return instance;
+    }
+
+    static void set(ButtonActionManager* inst){
+        if(instance){
+            instance->release();
+        }
+        instance = inst;
+        inst->retain();
+    }
+
+    ButtonActionManager(){
+        this->autorelease();
+    }
+
+    virtual void activate(CCMenuItem* sender){
+        log::debug("activate the main");
+        sender->activate();
+    }
+
+    virtual void selected(CCMenuItem* sender){
+        sender->selected();
+    }
+
+    virtual void unselected(CCMenuItem* sender){
+        sender->unselected();
+    }
+};
+ButtonActionManager* ButtonActionManager::instance = nullptr;
+
+class OtherButtonManager : public ButtonActionManager{
+    void selected(CCMenuItem* sender){
+        log::debug("now does stuff on select");
+        sender->selected();
+    }
+};
+
+class $modify(CCMenuItemSpriteExtra){
+    void selected(){
+        auto buttonManager = ButtonActionManager::get();
+        buttonManager->selected(this);
+    }
+    void activate(){
+        auto buttonManager = ButtonActionManager::get();
+        
+        buttonManager->activate(this);
+        //auto other = new OtherButtonManager();
+        //ButtonActionManager::set(other);
+    }
+    void unselected(){
+        auto buttonManager = ButtonActionManager::get();
+        buttonManager->unselected(this);
+    }
+};

src/HoldButtonManager.cpp

@@ -1,10 +1,21 @@
 #include <Geode/Geode.hpp>
 #include "HoldButtonManager.hpp"
 
-HoldButtonManager* HoldButtonManager::instance = nullptr;
+//HoldButtonManager* HoldButtonManager::instance = nullptr;
 
 
-void HoldButtonManager::registerWithNode(CCNode* node ,CircleBaseSize size) { //final goal is to make user pass in a basedButtonSprite
+HoldButtonManager* HoldButtonManager::get() {
+    static HoldButtonManager* instance = nullptr;
+    if(!instance){
+        instance = new HoldButtonManager();
+        //log::debug("this should only happen once");
+        //log::debug("afterafterafter{}", instance->m_animate->retainCount());
+    }
+    log::debug("afterafterafter{}", instance->m_animate->retainCount());
+    return instance;
+}
+
+void HoldButtonManager::registerWithNode(CCNode* node) { //final goal is to make user pass in a basedButtonSprite
     auto button = static_cast<MyCCMenuItemSpriteExtra*>(node);
     if(!button){
         log::error("failed to cast {}", node->getID());
@@ -13,7 +24,7 @@ void HoldButtonManager::registerWithNode(CCNode* node ,CircleBaseSize size) { //
     auto gif = CCAnimatedSprite::createWithSpriteFrame(
         CCSpriteFrameCache::get()->spriteFrameByName("HoldLoadingA.png"_spr)
     );
-    auto selectSprite = CircleButtonSprite::create(gif, CircleBaseColor::Green, size);
+    auto selectSprite = CircleButtonSprite::create(gif, CircleBaseColor::Green, CircleBaseSize::Medium);
 
     button->setSelectedImage(selectSprite);
     button->m_fields->m_originalCallback = button->m_pfnSelector;
@@ -25,38 +36,26 @@ void HoldButtonManager::registerWithNode(CCNode* node ,CircleBaseSize size) { //
     button->m_fields->m_activateCallback = std::bind(&HoldButtonManager::btnActivate, this, std::placeholders::_1);
 }
 
-void HoldButtonManager::registerBtn(std::string_view id, CCNode* menu, CircleBaseSize size){
+void HoldButtonManager::registerBtn(std::string_view id, CCNode* menu){
     auto node = menu->getChildByIDRecursive(id);
     if(!node) {
         //log::debug("failed to find {}", id);
         return;
     }
-    /*auto button = static_cast<MyCCMenuItemSpriteExtra*>(node); // I feel like this should break but it doesn't somehow
-    if(!button){
-        log::error("failed to cast {}", id);
-        return;
-    }*/
     log::debug("Making {} a hold button", id);
-    registerWithNode(node, size);
+    registerWithNode(node);
 }
 
 
 void HoldButtonManager::btnUnselect(CCObject* sender) {
     auto button = static_cast<CCMenuItemSpriteExtra*>(sender);
     CircleButtonSprite* sprite = typeinfo_cast<CircleButtonSprite*>(button->getSelectedImage());
     if(sprite) {
-        //log::debug("{}", m_animate->retainCount());
-        //auto animate = m_animate;
-        //CC_SAFE_RETAIN(animate);
-
         auto animSprite = static_cast<CCAnimatedSprite*>(sprite->getTopNode());
         if (animSprite) {
             log::debug("unselected");
             animSprite->stopAction(m_animate);
-            
-            //animSprite->runAction(m_animate);
         }
-        //CC_SAFE_RELEASE(animate);
     }
 }
 
@@ -79,8 +78,6 @@ void HoldButtonManager::btnSelect(CCObject* sender){
 
     CircleButtonSprite* sprite = typeinfo_cast<CircleButtonSprite*>(button->getSelectedImage());
     if(sprite) {
-        log::debug("{}", m_animate->retainCount());
-
         auto animSprite = static_cast<CCAnimatedSprite*>(sprite->getTopNode());
         if (animSprite) {
             animSprite->stopAllActions();
@@ -89,8 +86,8 @@ void HoldButtonManager::btnSelect(CCObject* sender){
     }
 }
 
-//https://www.merriam-webster.com/thesaurus/instantiate
-void HoldButtonManager::embodyAnimate(){
+
+void HoldButtonManager::loadAnimate(){
     auto frames = CCArray::create();
 
     for(int i = 'A'; i<='T'; i++) { 
@@ -106,7 +103,6 @@ void HoldButtonManager::embodyAnimate(){
         //m_fields->m_animation->addSpriteFrame(CCSpriteFrameCache::get()->spriteFrameByName(ahhh));
     }
     auto animation = CCAnimation::createWithSpriteFrames(frames, 0.025);
-    //animation->retain(); //FOR TESTING THIS CAUSES A LEAK
     m_animate = CCAnimate::create(animation);
 
     CC_SAFE_RETAIN(m_animate);

src/HoldButtonManager.hpp

@@ -1,42 +1,28 @@
-
+#pragma once
 #include <Geode/Geode.hpp>
 
 using namespace geode::prelude;
 
-class HoldButtonManager : CCNode {
-    static HoldButtonManager* instance;
+class HoldButtonManager : CCObject {
+    //static HoldButtonManager* instance;
 public:
     utils::Timer<std::chrono::high_resolution_clock> m_timer;
     CCAnimate* m_animate;
     HoldButtonManager(){
-        embodyAnimate();
-
+        loadAnimate();
         m_timer = utils::Timer();
-
     }
     ~HoldButtonManager(){
         //log::debug("deleting");
         m_animate->release();
     }
 
 
-    static HoldButtonManager* get() {
-        if(!instance){
-            instance = new HoldButtonManager();
-            //log::debug("this should only happen once");
-            //log::debug("afterafterafter{}", instance->m_animate->retainCount());
-        }
-        log::debug("afterafterafter{}", instance->m_animate->retainCount());
-        return instance;
-    }
-
-    void registerWithNode(CCNode* node ,CircleBaseSize size);
+    static HoldButtonManager* get() ;
 
-    void registerBtn(std::string_view id, CCNode* menu, CircleBaseSize size);
+    void registerWithNode(CCNode* node);
 
-    void registerBtn(std::string_view id, CCNode* menu) {
-        registerBtn(id, menu, CircleBaseSize::Medium);
-    }
+    void registerBtn(std::string_view id, CCNode* menu);
 
     void btnUnselect(CCObject* sender);
 
@@ -45,8 +31,7 @@ class HoldButtonManager : CCNode {
     void btnSelect(CCObject* sender);
 
 private:
-    //https://www.merriam-webster.com/thesaurus/instantiate
-    void embodyAnimate();
+    void loadAnimate();
 };
 
 
@@ -72,11 +57,9 @@ class $modify(MyCCMenuItemSpriteExtra, CCMenuItemSpriteExtra) {
 
     void activate() {
         //log::debug("{}",rect().size);
-
         if(m_fields->m_activateCallback){
             m_fields->m_activateCallback(this);
         }
-        
         CCMenuItemSpriteExtra::activate();
     }
 

src/ToggleButton.hpp

@@ -0,0 +1,2 @@
+#pragma once
+