use callbacks in menu ui

Author: BlueWitherer

.gitignore

@@ -61,4 +61,7 @@ build-*/
 
 # CLion
 .idea/
-/cmake-build-*/
+/cmake-build-*/
+
+# uh
+*.ini

src/hooks/PlayerObject/RandomGamemode.cpp

@@ -2,28 +2,28 @@
 
 #include <Geode/Geode.hpp>
 
-using namespace geode::prelude;
-
 namespace horrible {
-    // Event for option toggles
-    struct CategoryEvent final : Event<CategoryEvent, bool(std::string_view, bool)> {
-        using Event::Event;
-    };
-
-    class OptionCategoryItem final : public CCMenu {
+    class OptionCategoryItem final : public cocos2d::CCMenu {
     private:
         class Impl;
         std::unique_ptr<Impl> m_impl;
 
+        using Callback = geode::Function<void(std::string_view, bool)>;
+
     protected:
         OptionCategoryItem();
         ~OptionCategoryItem();
 
         void onToggle(CCObject* sender);
 
-        bool init(CCSize const& size, std::string category);
+        bool init(cocos2d::CCSize const& size, std::string category);
 
     public:
-        static OptionCategoryItem* create(CCSize const& size, std::string category);
+        static OptionCategoryItem* create(cocos2d::CCSize const& size, std::string category);
+
+        void setToggleCallback(Callback&& callback);
+        void setToggled(bool on);
+
+        geode::ZStringView getCategory() const noexcept;
     };
 };

src/menu/OptionCategoryItem.h

@@ -4,31 +4,27 @@
 
 #include <Geode/Geode.hpp>
 
-using namespace geode::prelude;
-using namespace horrible;
-
 namespace horrible {
-    // Event for pin toggles
-    struct PinEvent final : Event<PinEvent, bool()> {
-        using Event::Event;
-    };
-
-    class OptionItem final : public CCMenu, private FLAlertLayerProtocol {
+    class OptionItem final : public cocos2d::CCMenu, private FLAlertLayerProtocol {
     private:
         class Impl;
         std::unique_ptr<Impl> m_impl;
 
+        using Callback = Function<void()>;
+
     protected:
         OptionItem();
         ~OptionItem();
 
-        void onToggle(CCObject*);
-        void onPin(CCObject* sender);
+        void onToggle(cocos2d::CCObject*);
+        void onPin(cocos2d::CCObject* sender);
 
-        bool init(CCSize const& size, Option option, bool devMode);
+        bool init(cocos2d::CCSize const& size, Option option, bool devMode);
 
     public:
-        static OptionItem* create(CCSize const& size, Option option, bool devMode);
+        static OptionItem* create(cocos2d::CCSize const& size, Option option, bool devMode);
+
+        void setPinCallback(Callback&& callback);
 
         Option const& getOption() const noexcept;
         bool isCompatible() const noexcept;

src/menu/OptionItem.h

@@ -6,8 +6,6 @@
 
 #include <Geode/Geode.hpp>
 
-using namespace geode::prelude;
-
 namespace horrible {
     class OptionMenu final : public Popup {
     private:

src/menu/OptionMenu.h

@@ -2,10 +2,8 @@
 
 #include <Geode/Geode.hpp>
 
-using namespace geode::prelude;
-
 namespace horrible {
-    class OptionMenuButton final : public CCLayer {
+    class OptionMenuButton final : public cocos2d::CCLayer {
     private:
         class Impl;
         std::unique_ptr<Impl> m_impl;
@@ -31,14 +29,14 @@ namespace horrible {
         void onEnter() override;
 
         void setScale(float scale) override;
-        void setPosition(CCPoint const& position) override;
+        void setPosition(cocos2d::CCPoint const& position) override;
 
         void setTheme(std::string theme);
 
         // CCLayer targeted touch listener methods
-        bool ccTouchBegan(CCTouch* touch, CCEvent* event) override;
-        virtual void ccTouchMoved(CCTouch* touch, CCEvent* event) override;
-        virtual void ccTouchEnded(CCTouch* touch, CCEvent* event) override;
+        bool ccTouchBegan(cocos2d::CCTouch* touch, cocos2d::CCEvent* event) override;
+        virtual void ccTouchMoved(cocos2d::CCTouch* touch, cocos2d::CCEvent* event) override;
+        virtual void ccTouchEnded(cocos2d::CCTouch* touch, cocos2d::CCEvent* event) override;
 
         int64_t getOpacitySetting() const noexcept;
         float getScaleSetting() const noexcept;

src/menu/OptionMenuButton.h

@@ -4,12 +4,10 @@
 
 #include <Geode/loader/SettingV3.hpp>
 
-using namespace geode::prelude;
-
 namespace horrible {
-    class HorribleSettingV3 final : public SettingV3 {
+    class HorribleSettingV3 final : public geode::SettingV3 {
     public:
-        static Result<std::shared_ptr<SettingV3>> parse(
+        static geode::Result<std::shared_ptr<SettingV3>> parse(
             std::string key,
             std::string modID,
             matjson::Value const& json);
@@ -21,10 +19,10 @@ namespace horrible {
 
         void reset() override;
 
-        SettingNodeV3* createNode(float width) override;
+        geode::SettingNodeV3* createNode(float width) override;
     };
 
-    class HorribleSettingNodeV3 final : public SettingNodeV3 {
+    class HorribleSettingNodeV3 final : public geode::SettingNodeV3 {
     private:
         class Impl;
         std::unique_ptr<Impl> m_impl;
@@ -33,7 +31,7 @@ namespace horrible {
         HorribleSettingNodeV3();
         ~HorribleSettingNodeV3();
 
-        void updateState(CCNode* invoker) override;
+        void updateState(cocos2d::CCNode* invoker) override;
         void onCommit() override;
         void onResetToDefault() override;
 

src/menu/SettingV3.h

@@ -11,6 +11,8 @@ class OptionCategoryItem::Impl final {
     std::string category = "";  // The category name
 
     CCMenuItemToggler* toggler = nullptr;  // The toggler for the option
+
+    Callback toggleCallback = nullptr;  // Callback for when the category is toggled
 };
 
 OptionCategoryItem::OptionCategoryItem() : m_impl(std::make_unique<Impl>()) {};
@@ -67,19 +69,25 @@ bool OptionCategoryItem::init(CCSize const& size, std::string category) {
 
     addChild(nameLabel);
 
-    addEventListener(
-        CategoryEvent(),
-        [this](std::string_view category, bool enabled) {
-            if (m_impl->toggler) {
-                if (category != m_impl->category) m_impl->toggler->toggle(false);
-            };
-        });
-
     return true;
 };
 
 void OptionCategoryItem::onToggle(CCObject* sender) {
-    if (m_impl->toggler) CategoryEvent().send(m_impl->category, !m_impl->toggler->isOn());
+    if (m_impl->toggler) {
+        if (m_impl->toggleCallback) m_impl->toggleCallback(m_impl->category, !m_impl->toggler->isOn());
+    };
+};
+
+void OptionCategoryItem::setToggleCallback(Callback&& callback) {
+    m_impl->toggleCallback = std::move(callback);
+};
+
+void OptionCategoryItem::setToggled(bool on) {
+    if (m_impl->toggler) m_impl->toggler->toggle(on);
+};
+
+ZStringView OptionCategoryItem::getCategory() const noexcept {
+    return m_impl->category;
 };
 
 OptionCategoryItem* OptionCategoryItem::create(CCSize const& size, std::string category) {

src/menu/src/OptionCategoryItem.cpp

@@ -11,12 +11,12 @@ class OptionItem::Impl final {
 public:
     bool compatible = false;  // If this option is compatible with the current platform
 
-    // The option
-    Option option;
+    Option option;  // A copy of the option
 
     CCMenuItemToggler* toggler = nullptr;  // The toggler for the option
+    CCNode* newContainer = nullptr;        // Container for the "New!" label and icon
 
-    CCNode* newContainer = nullptr;
+    Callback pinCallback = nullptr;  // Callback for when the option is pinned or unpinned
 
     // Save the current state of the toggler as the option state
     void saveTogglerState() {
@@ -294,12 +294,16 @@ void OptionItem::onToggle(CCObject*) {
 void OptionItem::onPin(CCObject* sender) {
     if (auto pinBtn = typeinfo_cast<CCMenuItemToggler*>(sender)) {
         options::set(m_impl->option.getID(), options::isEnabled(m_impl->option.getID()), !pinBtn->isToggled(), true);
-        PinEvent().send();
 
+        if (m_impl->pinCallback) m_impl->pinCallback();
         m_impl->clearNewLabel();
     };
 };
 
+void OptionItem::setPinCallback(Callback&& callback) {
+    m_impl->pinCallback = std::move(callback);
+};
+
 Option const& OptionItem::getOption() const noexcept {
     return m_impl->option;
 };