use geode button

Author: BlueWitherer

mod.json

@@ -1,5 +1,5 @@
 {
-    "geode": "5.0.0-beta.4",
+    "geode": "5.0.0",
     "gd": {
         "win": "2.2081",
         "android": "2.2081",

src/Utils.hpp

@@ -13,6 +13,8 @@
 
 #include <cocos2d.h>
 
+#include <Geode/ui/Button.hpp>
+
 #include <Geode/binding/FMODAudioEngine.hpp>
 
 // Additional utility methods for Horrible Ideas

src/menu/OptionMenu.hpp

@@ -21,12 +21,10 @@ class OptionMenu final : public Popup {
         ccColor3B color;
     };
 
-    using Callback = void(*)(CCMenuItem*);
-
     struct SocialBtnData final {
         const char* sprite;
         const char* id;
-        Callback callback;
+        Button::ButtonCallback callback;
     };
 
 protected:

src/menu/src/OptionMenu.cpp

@@ -8,7 +8,6 @@
 #include <Geode/Geode.hpp>
 
 #include <Geode/ui/GeodeUI.hpp>
-#include <Geode/ui/TextInput.hpp>
 
 #include <Geode/utils/terminate.hpp>
 
@@ -204,7 +203,7 @@ bool OptionMenu::init() {
             btnSprite->m_label->setColor(filterBtn.color);
             btnSprite->setScale(0.8f);
 
-            if (auto btn = CCMenuItemExt::createSpriteExtra(
+            if (auto btn = Button::createWithNode(
                 btnSprite,
                 [this, filterBtn](auto) {
                     // Toggle: clicking same button disables filter
@@ -228,15 +227,14 @@ bool OptionMenu::init() {
 
     m_mainLayer->addChild(filterMenu);
 
-    // get the options data
+    // get all the options data
     m_impl->filterOptions(options::getAll());
 
-    // add a mod settings at the bottom left
     // @geode-ignore(unknown-resource)
     auto settingsBtnSprite = CircleButtonSprite::createWithSpriteFrameName("geode.loader/settings.png");
     settingsBtnSprite->setScale(0.625f);
 
-    auto settingsBtn = CCMenuItemExt::createSpriteExtra(
+    auto settingsBtn = Button::createWithNode(
         settingsBtnSprite,
         [](auto) {
             openSettingsPopup(horribleMod);
@@ -249,7 +247,7 @@ bool OptionMenu::init() {
     auto resetFiltersBtnSprite = CCSprite::createWithSpriteFrameName("GJ_replayBtn_001.png");
     resetFiltersBtnSprite->setScale(0.375f);
 
-    auto resetFiltersBtn = CCMenuItemExt::createSpriteExtra(
+    auto resetFiltersBtn = Button::createWithNode(
         resetFiltersBtnSprite,
         [this](auto) {
             createQuickPopup(
@@ -283,7 +281,7 @@ bool OptionMenu::init() {
     socialMenu->setContentWidth(0.f);
     socialMenu->setLayout(socialMenuLayout);
 
-    constexpr SocialBtnData socialBtns[] = {
+    auto socialBtns = std::to_array<SocialBtnData>({
         {
             "gj_ytIcon_001.png",
             "horrible-mods-series-btn",
@@ -320,15 +318,15 @@ bool OptionMenu::init() {
                 openSupportPopup(horribleMod);
             }
         }
-    };
+                                                   });
 
-    for (auto const& socialBtn : socialBtns) {
+    for (auto& socialBtn : socialBtns) {
         if (auto sprite = CCSprite::createWithSpriteFrameName(socialBtn.sprite)) {
             sprite->setScale(0.75f);
 
-            if (auto btn = CCMenuItemExt::createSpriteExtra(
+            if (auto btn = Button::createWithNode(
                 sprite,
-                socialBtn.callback
+                std::move(socialBtn.callback)
             )) {
                 btn->setID(socialBtn.id);
 

src/menu/src/SettingV3.cpp

@@ -4,6 +4,8 @@
 
 #include <Geode/Geode.hpp>
 
+#include <Geode/ui/Button.hpp>
+
 using namespace geode::prelude;
 using namespace horrible::prelude;
 
@@ -41,7 +43,7 @@ SettingNodeV3* HorribleSettingV3::createNode(float width) {
 class HorribleSettingNodeV3::Impl final {
 public:
     Ref<ButtonSprite> buttonSprite = nullptr;
-    CCMenuItemSpriteExtra* button = nullptr;
+    Button* button = nullptr;
 };
 
 HorribleSettingNodeV3::HorribleSettingNodeV3() : m_impl(std::make_unique<Impl>()) {};
@@ -58,7 +60,7 @@ bool HorribleSettingNodeV3::init(std::shared_ptr<HorribleSettingV3> setting, flo
     );
     m_impl->buttonSprite->setScale(.5f);
 
-    m_impl->button = CCMenuItemExt::createSpriteExtra(
+    m_impl->button = Button::createWithNode(
         m_impl->buttonSprite,
         [](auto) {
             menu::open();