Skip to content

Commit

Permalink
allium 2.2074
Browse files Browse the repository at this point in the history
altalk23 committed Dec 22, 2024
1 parent ab8ecb6 commit 3ad8eff
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions include/Allium/ui/AlliumButtonBar.hpp
Original file line number Diff line number Diff line change
@@ -26,22 +26,22 @@ namespace allium {

CCMenuItemSpriteExtra* addButton(
std::string_view spriteName, std::string_view bgName, std::string_view id,
geode::utils::MiniFunction<void(CCMenuItemSpriteExtra*)> const& callback
std::function<void(CCMenuItemSpriteExtra*)> const& callback
);

CCMenuItemSpriteExtra* addDefaultButton(
std::string_view spriteName, std::string_view id,
geode::utils::MiniFunction<void(CCMenuItemSpriteExtra*)> const& callback
std::function<void(CCMenuItemSpriteExtra*)> const& callback
);

CCMenuItemToggler* addToggle(
std::string_view spriteName, std::string_view bgOnName, std::string_view bgOffName, std::string_view id,
geode::utils::MiniFunction<void(CCMenuItemToggler*)> const& callback
std::function<void(CCMenuItemToggler*)> const& callback
);

CCMenuItemToggler* addDefaultToggle(
std::string_view spriteName, std::string_view id,
geode::utils::MiniFunction<void(CCMenuItemToggler*)> const& callback
std::function<void(CCMenuItemToggler*)> const& callback
);
};
}
10 changes: 5 additions & 5 deletions mod.json
Original file line number Diff line number Diff line change
@@ -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",
8 changes: 4 additions & 4 deletions src/ui/AlliumButtonBar.cpp
Original file line number Diff line number Diff line change
@@ -150,14 +150,14 @@ BrushDrawer* AlliumButtonBar::getBrushDrawer() const {

CCMenuItemSpriteExtra* AlliumButtonBar::addDefaultButton(
std::string_view spriteName, std::string_view id,
utils::MiniFunction<void(CCMenuItemSpriteExtra*)> const& callback
std::function<void(CCMenuItemSpriteExtra*)> 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<void(CCMenuItemSpriteExtra*)> const& callback
std::function<void(CCMenuItemSpriteExtra*)> 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<void(CCMenuItemToggler*)> const& callback
std::function<void(CCMenuItemToggler*)> 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<void(CCMenuItemToggler*)> const& callback
std::function<void(CCMenuItemToggler*)> const& callback
) {
auto sprite = CCSprite::createWithSpriteFrameName(spriteName.data());
auto bgOff = CCSprite::create(bgOffName.data());

0 comments on commit 3ad8eff

Please sign in to comment.