diff --git a/CMakeLists.txt b/CMakeLists.txt index d8c3192..b919623 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") set(CMAKE_CXX_VISIBILITY_PRESET hidden) -project(Allium VERSION 1.0.0) +project(Allium VERSION 0.4.0) add_library(${PROJECT_NAME} SHARED src/main.cpp diff --git a/include/Allium/ui/AlliumButtonBar.hpp b/include/Allium/ui/AlliumButtonBar.hpp index 0f6abb3..6f81992 100644 --- a/include/Allium/ui/AlliumButtonBar.hpp +++ b/include/Allium/ui/AlliumButtonBar.hpp @@ -26,22 +26,22 @@ namespace allium { CCMenuItemSpriteExtra* addButton( std::string_view spriteName, std::string_view bgName, std::string_view id, - geode::utils::MiniFunction const& callback + std::function const& callback ); CCMenuItemSpriteExtra* addDefaultButton( std::string_view spriteName, std::string_view id, - geode::utils::MiniFunction const& callback + std::function const& callback ); CCMenuItemToggler* addToggle( std::string_view spriteName, std::string_view bgOnName, std::string_view bgOffName, std::string_view id, - geode::utils::MiniFunction const& callback + std::function const& callback ); CCMenuItemToggler* addDefaultToggle( std::string_view spriteName, std::string_view id, - geode::utils::MiniFunction const& callback + std::function const& callback ); }; } \ No newline at end of file diff --git a/mod.json b/mod.json index aad19c8..cb02a81 100644 --- a/mod.json +++ b/mod.json @@ -1,11 +1,11 @@ { - "geode": "3.4.0", + "geode": "4.1.1", "gd": { - "win": "2.206", - "android": "2.206", - "mac": "2.206" + "win": "2.2074", + "android": "2.2074", + "mac": "2.2074" }, - "version": "v0.3.4-alpha", + "version": "0.4.0", "id": "alk.allium", "name": "Allium Drawing Tool", "developer": "alk", diff --git a/src/ui/AlliumButtonBar.cpp b/src/ui/AlliumButtonBar.cpp index d98de30..de5a659 100644 --- a/src/ui/AlliumButtonBar.cpp +++ b/src/ui/AlliumButtonBar.cpp @@ -150,14 +150,14 @@ BrushDrawer* AlliumButtonBar::getBrushDrawer() const { CCMenuItemSpriteExtra* AlliumButtonBar::addDefaultButton( std::string_view spriteName, std::string_view id, - utils::MiniFunction const& callback + std::function const& callback ) { return this->addButton(spriteName, "NeutralButton.png"_spr, id, callback); } CCMenuItemSpriteExtra* AlliumButtonBar::addButton( std::string_view spriteName, std::string_view bgName, std::string_view id, - utils::MiniFunction const& callback + std::function const& callback ) { auto sprite = CCSprite::createWithSpriteFrameName(spriteName.data()); auto bg = CCSprite::create(bgName.data()); @@ -176,14 +176,14 @@ CCMenuItemSpriteExtra* AlliumButtonBar::addButton( CCMenuItemToggler* AlliumButtonBar::addDefaultToggle( std::string_view spriteName, std::string_view id, - utils::MiniFunction const& callback + std::function const& callback ) { return this->addToggle(spriteName, "DeactiveButton.png"_spr, "ActiveButton.png"_spr, id, callback); } CCMenuItemToggler* AlliumButtonBar::addToggle( std::string_view spriteName, std::string_view bgOnName, std::string_view bgOffName, std::string_view id, - utils::MiniFunction const& callback + std::function const& callback ) { auto sprite = CCSprite::createWithSpriteFrameName(spriteName.data()); auto bgOff = CCSprite::create(bgOffName.data());