preset ui progress

Author: abb2k

src/nodes/FloatingList.cpp

@@ -76,8 +76,18 @@ void FloatingList::addItem(const FloatingListItem& text){
 
     float off = 5;
 
+    CCMenuItemSpriteExtra* sideBtn = nullptr;
+    if (text.sideButtonSprite != nullptr){
+        sideBtn = CCMenuItemSpriteExtra::create(
+            text.sideButtonSprite,
+            this,
+            menu_selector(FloatingList::sideBtnClicked)
+        );
+        sideBtn->setTag(text.id);
+    }
+
     auto buttonSpr = ButtonSprite::create(text.text.c_str(), text.font.c_str(), text.BGTexture.c_str());
-    float wantedScaleX = (this->getContentWidth() - off) / buttonSpr->getContentWidth();
+    float wantedScaleX = (this->getContentWidth() - off - (sideBtn != nullptr ? sideBtn->getContentWidth() : 0)) / buttonSpr->getContentWidth();
     float wantedScaleY = (elementHeight - off) / buttonSpr->getContentHeight();
     buttonSpr->setScale(wantedScaleX > wantedScaleY ? wantedScaleY : wantedScaleX);
     auto buttonItem = CCMenuItemSpriteExtra::create(
@@ -94,6 +104,10 @@ void FloatingList::addItem(const FloatingListItem& text){
     });
     buttonItem->setPosition(menu->getContentSize() / 2);
 
+    if (sideBtn != nullptr){
+        menu->addChild(sideBtn);
+    }
+
     auto itemBG = CCScale9Sprite::create("square02_small.png");
     itemBG->setContentSize(menu->getContentSize());
     itemBG->setOpacity(150);
@@ -105,6 +119,8 @@ void FloatingList::addItem(const FloatingListItem& text){
     scrollLayer->m_contentLayer->addChild(menu);
     scrollLayer->m_contentLayer->updateLayout();
     itemIds[buttonItem] = text;
+    if (sideBtn != nullptr)
+        extraButtonsItemIds[sideBtn] = text;
 }
 void FloatingList::addItems(const std::vector<FloatingListItem>& texts){
     for (const auto& text : texts){
@@ -153,6 +169,9 @@ void FloatingList::setItemEnabled(bool isEnabled){
     for (const auto& [item, _] : itemIds){
         item->setEnabled(isEnabled);
     }
+    for (const auto& [item, _] : extraButtonsItemIds){
+        item->setEnabled(isEnabled);
+    }
 }
 
 void FloatingList::setCallback(geode::Function<void(const int& id)> callback){
@@ -166,6 +185,13 @@ void FloatingList::itemClicked(CCObject* sender){
     if (onItemClicked) onItemClicked(itemIds[btn].id);
 }
 
+void FloatingList::sideBtnClicked(CCObject* sender){
+    auto btn = static_cast<CCMenuItemSpriteExtra*>(sender);
+    if (!extraButtonsItemIds.contains(btn)) return;
+
+    extraButtonsItemIds[btn].sideButtonCallback(extraButtonsItemIds[btn].id);
+}
+
 void FloatingList::setOpenDirection(bool openUpwards){
     if (openUpwards){
         scrollLayer->setAnchorPoint({0.5f, 0});
@@ -218,4 +244,8 @@ void FloatingList::setEnabled(bool b){
     {
         btn->setEnabled(b);
     }
+    for (const auto& [btn, _] : extraButtonsItemIds)
+    {
+        btn->setEnabled(b);
+    }
 }

src/nodes/FloatingList.hpp

@@ -10,6 +10,9 @@ struct FloatingListItem {
     std::string text;
     std::string font = "bigFont.fnt";
     std::string BGTexture = "GJ_button_01.png";
+
+    CCNode* sideButtonSprite = nullptr;
+    geode::FunctionRef<void(int id)> sideButtonCallback = [](int){};
 };
 
 class FloatingList : public CCNode, public CCTouchDelegate {
@@ -38,12 +41,14 @@ class FloatingList : public CCNode, public CCTouchDelegate {
         geode::Function<void(const int& id)> onItemClicked;
 
         void itemClicked(CCObject* sender);
+        void sideBtnClicked(CCObject* sender);
 
         void setItemEnabled(bool isEnabled);
 
         bool ccTouchBegan(CCTouch *pTouch, CCEvent *pEvent) override;
 
         std::map<CCMenuItemSpriteExtra*, FloatingListItem> itemIds{};
+        std::map<CCMenuItemSpriteExtra*, FloatingListItem> extraButtonsItemIds{};
 
         ScrollLayer* scrollLayer;
         Scrollbar* scrollbar;

src/nodes/layers/DTLayer.cpp

@@ -453,6 +453,45 @@ bool DTLayer::init(GJGameLevel* const& level) {
     resetLayoutBtn->setPosition({0, 0});
     resetLayoutMenu->addChild(resetLayoutBtn);
 
+
+    auto layoutPresetsBtnSpr = ButtonSprite::create("Presets", "bigFont.fnt", "GJ_button_05.png");
+    layoutPresetsBtnSpr->setScale(.4f);
+    layoutPresetsBtnSpr->setCascadeOpacityEnabled(true);
+    auto layoutPresetsBtn = CCMenuItemSpriteExtra::create(
+        layoutPresetsBtnSpr,
+        this,
+        menu_selector(DTLayer::onLayoutPresets)
+    );
+    layoutPresetsBtn->setPosition({m_size.width, 0});
+    resetLayoutMenu->addChild(layoutPresetsBtn);
+
+    auto addPreset = CCSprite::createWithSpriteFrameName("GJ_plusBtn_001.png");
+    addPreset->setScale(.45f);
+    auto addPresetBtn = CCMenuItemSpriteExtra::create(
+        addPreset,
+        this,
+        menu_selector(DTLayer::onAddPreset)
+    );
+    addPresetBtn->setPosition(layoutPresetsBtn->getPosition() + ccp(
+        -layoutPresetsBtn->getContentWidth() / 2 - addPresetBtn->getContentWidth() / 2 - 1.5f,
+        0
+    ));
+    resetLayoutMenu->addChild(addPresetBtn);
+
+    auto exportPreset = CCSprite::createWithSpriteFrameName("GJ_shareBtn_001.png");
+    exportPreset->setScale(.25f);
+    auto exportPresetBtn = CCMenuItemSpriteExtra::create(
+        exportPreset,
+        this,
+        menu_selector(DTLayer::onExportPreset)
+    );
+    exportPresetBtn->setPosition(addPresetBtn->getPosition() + ccp(
+        -addPresetBtn->getContentWidth() / 2 - exportPresetBtn->getContentWidth() / 2 - 1.5f,
+        0
+    ));
+    resetLayoutMenu->addChild(exportPresetBtn);
+
+
     resetLayoutMenu->setOpacity(0);
 
     colorChangeBG = CCScale9Sprite::create("GJ_square05.png");
@@ -3531,4 +3570,15 @@ void DTLayer::FLAlert_Clicked(FLAlertLayer* layer, bool btn2){
 
     specialStrings["general"]->updateContent();
     specialStrings["s0"]->updateContent();
+}
+
+
+void DTLayer::onLayoutPresets(CCObject*){
+
+}
+void DTLayer::onAddPreset(CCObject*){
+
+}
+void DTLayer::onExportPreset(CCObject*){
+
 }

src/nodes/layers/DTLayer.hpp

@@ -320,4 +320,9 @@ class DTLayer : public Popup, public FLAlertLayerProtocol {
 
         ccColor3B originalNewBestColor = {255, 255, 255};
         ccColor3B originalSessionBestColor = {255, 255, 255};
+
+
+        void onLayoutPresets(CCObject*);
+        void onAddPreset(CCObject*);
+        void onExportPreset(CCObject*);
 };

src/types/DTTypes.cpp

@@ -299,6 +299,19 @@ matjson::Value matjson::Serialize<DTLayoutV3>::toJson(const DTLayoutV3& value) {
     });
 }
 
+Result<DTLayoutPreset> matjson::Serialize<DTLayoutPreset>::fromJson(const matjson::Value& value){
+    DTLayoutPreset preset;
+    GEODE_UNWRAP_INTO(preset.name, value["name"].asString());
+    GEODE_UNWRAP_INTO(preset.layout, value["layout"].as<DTLayoutV3>());
+    return Ok(preset);
+}
+matjson::Value matjson::Serialize<DTLayoutPreset>::toJson(const DTLayoutPreset& value){
+    return matjson::makeObject({
+        { "name", value.name },
+        { "layout", value.layout }
+    });
+}
+
 Result<V2LabelLayout> matjson::Serialize<V2LabelLayout>::fromJson(const matjson::Value& value) {
     V2LabelLayout layout;
     GEODE_UNWRAP_INTO(layout.labelName, value["labelName"].asString());

src/types/DTTypes.hpp

@@ -299,6 +299,17 @@ struct matjson::Serialize<DTLayoutV3> {
     static matjson::Value toJson(const DTLayoutV3& value);
 };
 
+struct DTLayoutPreset {
+    std::string name;
+    DTLayoutV3 layout;
+};
+
+template <>
+struct matjson::Serialize<DTLayoutPreset> {
+    static Result<DTLayoutPreset> fromJson(const matjson::Value& value);
+    static matjson::Value toJson(const DTLayoutPreset& value);
+};
+
 typedef struct {
     std::string labelName;
     std::string text;