make ColorPickPopup use a callback instead of a delegate

Author: Fleeym

loader/include/Geode/ui/ColorPickPopup.hpp

@@ -4,15 +4,11 @@
 #include "TextInput.hpp"
 #include "../loader/Event.hpp"
 #include <Geode/binding/TextInputDelegate.hpp>
+#include <Geode/utils/function.hpp>
 
 namespace geode {
     class ColorPickPopup;
 
-    class GEODE_DLL ColorPickPopupDelegate {
-    public:
-        virtual void updateColor(cocos2d::ccColor4B const& color) {}
-    };
-
     class GEODE_DLL ColorPickPopup :
         public Popup<cocos2d::ccColor4B const&, bool>,
         public cocos2d::extension::ColorPickerDelegate,
@@ -48,6 +44,6 @@ namespace geode {
         static ColorPickPopup* create(cocos2d::ccColor4B const& color);
 
         void setColorTarget(cocos2d::CCSprite* spr);
-        void setDelegate(ColorPickPopupDelegate* delegate);
+        void setCallback(geode::Function<void(cocos2d::ccColor4B const&)> callback);
     };
 }

loader/src/loader/SettingNodeV3.cpp

@@ -568,13 +568,9 @@ void Color3BSettingNodeV3::updateState(CCNode* invoker) {
 
 void Color3BSettingNodeV3::onSelectColor(CCObject*) {
     auto popup = ColorPickPopup::create(this->getValue());
-    popup->setDelegate(this);
+    popup->setCallback([this](ccColor4B const& color) { this->setValue(to3B(color), nullptr); });
     popup->show();
 }
-void Color3BSettingNodeV3::updateColor(ccColor4B const& color) {
-    this->setValue(to3B(color), nullptr);
-}
-
 Color3BSettingNodeV3* Color3BSettingNodeV3::create(std::shared_ptr<Color3BSettingV3> setting, float width) {
     auto ret = new Color3BSettingNodeV3();
     if (ret->init(setting, width)) {
@@ -616,12 +612,9 @@ void Color4BSettingNodeV3::updateState(CCNode* invoker) {
 
 void Color4BSettingNodeV3::onSelectColor(CCObject*) {
     auto popup = ColorPickPopup::create(this->getValue());
-    popup->setDelegate(this);
+    popup->setCallback([this](ccColor4B const& color) { this->setValue(color, nullptr); });
     popup->show();
 }
-void Color4BSettingNodeV3::updateColor(ccColor4B const& color) {
-    this->setValue(color, nullptr);
-}
 
 Color4BSettingNodeV3* Color4BSettingNodeV3::create(std::shared_ptr<Color4BSettingV3> setting, float width) {
     auto ret = new Color4BSettingNodeV3();

loader/src/loader/SettingNodeV3.hpp

@@ -274,29 +274,27 @@ class FileSettingNodeV3 : public SettingValueNodeV3<FileSettingV3> {
     static FileSettingNodeV3* create(std::shared_ptr<FileSettingV3> setting, float width);
 };
 
-class Color3BSettingNodeV3 : public SettingValueNodeV3<Color3BSettingV3>, public ColorPickPopupDelegate {
+class Color3BSettingNodeV3 : public SettingValueNodeV3<Color3BSettingV3> {
 protected:
     CCMenuItemSpriteExtra* m_colorBtn;
     ColorChannelSprite* m_colorSprite;
 
     bool init(std::shared_ptr<Color3BSettingV3> setting, float width);
     void updateState(CCNode* invoker) override;
     void onSelectColor(CCObject*);
-    void updateColor(ccColor4B const& color) override;
 
 public:
     static Color3BSettingNodeV3* create(std::shared_ptr<Color3BSettingV3> setting, float width);
 };
 
-class Color4BSettingNodeV3 : public SettingValueNodeV3<Color4BSettingV3>, public ColorPickPopupDelegate {
+class Color4BSettingNodeV3 : public SettingValueNodeV3<Color4BSettingV3> {
 protected:
     CCMenuItemSpriteExtra* m_colorBtn;
     ColorChannelSprite* m_colorSprite;
 
     bool init(std::shared_ptr<Color4BSettingV3> setting, float width);
     void updateState(CCNode* invoker) override;
     void onSelectColor(CCObject*);
-    void updateColor(ccColor4B const& color) override;
 
 public:
     static Color4BSettingNodeV3* create(std::shared_ptr<Color4BSettingV3> setting, float width);

loader/src/ui/nodes/ColorPickPopup.cpp

@@ -4,6 +4,7 @@
 #include <Geode/binding/SliderThumb.hpp>
 #include <Geode/ui/ColorPickPopup.hpp>
 #include <Geode/utils/cocos.hpp>
+#include <Geode/utils/function.hpp>
 #include <charconv>
 #include <clocale>
 #include <Geode/loader/Mod.hpp>
@@ -21,7 +22,7 @@ class ColorPickPopup::Impl final {
     TextInput* m_bInput;
     TextInput* m_hexInput;
     TextInput* m_opacityInput = nullptr;
-    ColorPickPopupDelegate* m_delegate = nullptr;
+    geode::Function<void(cocos2d::ccColor4B const&)> m_callback;
     cocos2d::CCSprite* m_newColorSpr;
     CCMenuItemSpriteExtra* m_resetBtn;
 };
@@ -370,8 +371,8 @@ void ColorPickPopup::onReset(CCObject*) {
 }
 
 void ColorPickPopup::onClose(CCObject* sender) {
-    if (m_impl->m_delegate) {
-        m_impl->m_delegate->updateColor(m_impl->m_color);
+    if (m_impl->m_callback) {
+        m_impl->m_callback(m_impl->m_color);
     }
     Popup::onClose(sender);
 }
@@ -424,8 +425,8 @@ void ColorPickPopup::colorValueChanged(ccColor3B color) {
     this->updateState(m_impl->m_picker);
 }
 
-void ColorPickPopup::setDelegate(ColorPickPopupDelegate* delegate) {
-    m_impl->m_delegate = delegate;
+void ColorPickPopup::setCallback(geode::Function<void(cocos2d::ccColor4B const&)> callback) {
+    m_impl->m_callback = std::move(callback);
 }
 
 void ColorPickPopup::setColorTarget(cocos2d::CCSprite* spr) {