fix

Author: OmgRod

mod.json

@@ -25,11 +25,46 @@
             "type": "bool",
             "default": false
         },
-        "color": {
-            "name": "Color Offset",
+        "color-0": {
+            "name": "Color Offset - 1st",
             "description": "The color offset of the background.",
-            "type": "color",
-            "default": "#FF0000",
+            "type": "string",
+            "default": "244,212,142",
+            "enable-if": "enable-color"
+        },
+        "color-1": {
+            "name": "Color Offset - 2nd",
+            "description": "The color offset of the background.",
+            "type": "string",
+            "default": "245,174,125",
+            "enable-if": "enable-color"
+        },
+        "color-2": {
+            "name": "Color Offset - 3rd",
+            "description": "The color offset of the background.",
+            "type": "string",
+            "default": "236,137,124",
+            "enable-if": "enable-color"
+        },
+        "color-3": {
+            "name": "Color Offset - 4th",
+            "description": "The color offset of the background.",
+            "type": "string",
+            "default": "213,105,133",
+            "enable-if": "enable-color"
+        },
+        "color-4": {
+            "name": "Color Offset - 5th",
+            "description": "The color offset of the background.",
+            "type": "string",
+            "default": "173,84,146",
+            "enable-if": "enable-color"
+        },
+        "color-5": {
+            "name": "Color Offset - 6th",
+            "description": "The color offset of the background.",
+            "type": "string",
+            "default": "113,74,154",
             "enable-if": "enable-color"
         },
         "show-main": {

src/CustomSettingLayer.cpp

@@ -7,16 +7,13 @@
 using namespace geode::prelude;
 
 $execute {
-    /*
     new EventListener<EventFilter<ModPopupUIEvent>>(+[](ModPopupUIEvent* event) {
         if (event->getModID() == "omgrod.geodify") {
             auto popup = event->getPopup();
 
             if (popup) {
                 if (CCMenuItemSpriteExtra* btn = typeinfo_cast<CCMenuItemSpriteExtra*>(popup->getChildByIDRecursive("settings-button"))) {
-                    btn->setTarget(this, menu_selector(GYSettingSelectLayer::settingsBtn));
-                    
-                    // btn->m_pfnSelector = menu_selector(GYSettingSelectLayer::settingsBtn); // this code sucks - it keeps crashing. im sorry if creating a fake button is a bit too much
+                    btn->m_pfnSelector = menu_selector(GYSettingSelectLayer::settingsBtn); // this code sucks - it keeps crashing. im sorry if creating a fake button is a bit too much
 
                     // CCSprite* settings = CCSprite::create("geode.loader/settings.png");
                     // CircleButtonSprite* settingsBtn = nullptr;
@@ -40,11 +37,11 @@ using namespace geode::prelude;
         }
         return ListenerResult::Propagate;
     });
-    */
 }
 
 /// @brief The following code is for testing purposes only, and adds a Geodify settings button to the main menu.
 
+/*
 #include <Geode/modify/MenuLayer.hpp>
 
 class $modify(MyMenuLayer, MenuLayer) {
@@ -70,4 +67,4 @@ class $modify(MyMenuLayer, MenuLayer) {
 
         return true;
     }
-};
+}*/

src/layers/GYSettingSelectLayer.cpp

@@ -5,7 +5,11 @@
 using namespace geode::prelude;
 
 void GYSettingSelectLayer::keyBackClicked() {
-    CCDirector::get()->popScene();
+    CCDirector::sharedDirector()->popSceneWithTransition(0.5f, PopTransition::kPopTransitionFade);
+}
+
+void GYSettingSelectLayer::backWrapper(CCObject* sender) {
+    GYSettingSelectLayer::keyBackClicked();
 }
 
 CCScene* GYSettingSelectLayer::scene() {
@@ -25,27 +29,79 @@ GYSettingSelectLayer* GYSettingSelectLayer::create() {
 }
 
 void GYSettingSelectLayer::settingsBtn(CCObject* sender) {
-    auto scenePrev = CCTransitionFade::create(0.5f, GYSettingSelectLayer::scene());
+    auto scene = CCScene::create();
+    GYSettingSelectLayer* ret = new GYSettingSelectLayer();
+    // Everything after this is not compiled
+    if (ret && ret->init()) {
+        ret->autorelease();
+    }
+    delete ret;
+    ret = nullptr;
+    scene->addChild(GYSettingSelectLayer::create());
+    auto scenePrev = CCTransitionFade::create(0.5f, scene);
     CCDirector::sharedDirector()->pushScene(scenePrev);
 }
 
 bool GYSettingSelectLayer::init() {
-    if (!GYSettingSelectLayer::init())
+    if (!CCLayer::init())
         return false;
 
-    setKeyboardEnabled(true);
+    setKeypadEnabled(true);
 
     auto winSize = CCDirector::sharedDirector()->getWinSize();
     auto menu = CCMenu::create();
+    menu->setID("menu");
 
     auto background = CCSprite::create("GJ_gradientBG.png");
     background->setScaleX(CCDirector::sharedDirector()->getWinSize().width / background->getContentSize().width);
     background->setScaleY(CCDirector::sharedDirector()->getWinSize().height / background->getContentSize().height);
     background->setZOrder(-1);
     background->setColor({ 0, 102, 255 });
     background->setID("background");
-    background->setPosition({ 0.f, 0.f });
+    background->setPosition({ winSize.width / 2, winSize.height / 2 });
     this->addChild(background);
+
+    auto backBtn = CCMenuItemSpriteExtra::create(
+        CCSprite::createWithSpriteFrameName("GJ_arrow_01_001.png"),
+        this,
+        menu_selector(GYSettingSelectLayer::backWrapper)
+    );
+    backBtn->setPosition(winSize.width * -0.45, winSize.height * 0.4);
+    backBtn->setID("back-btn");
+    menu->addChild(backBtn);
+
+    auto title = CCLabelBMFont::create("Geodify Settings", "bigFont.fnt");
+    title->setPosition(winSize.width / 2, winSize.height * 0.9);
+    title->setID("title");
+    this->addChild(title);
+
+    auto leftMenu = CCMenu::create();
+    leftMenu->setAnchorPoint({ 0, 0 });
+    leftMenu->setContentSize({ 0.f, winSize.height * 0.6f });
+    leftMenu->setPosition({ winSize.width * 0.1f, winSize.height * 0.2f });
+    leftMenu->setID("left-menu");
+
+    auto leftLayout = ColumnLayout::create();
+    leftLayout->setAxis(Axis::Column);
+    leftLayout->setGap(10.f);
+    
+    leftMenu->setLayout(leftLayout);
+
+    auto colorBtn = CCMenuItemSpriteExtra::create(
+        CCSprite::createWithSpriteFrameName(
+            "GJ_paintBtn_001.png"
+        ),
+        this,
+        menu_selector(GYSettingSelectLayer::settingsBtn)
+    );
+    colorBtn->setID("color-button");
+
+    leftMenu->addChild(colorBtn);
+
+    leftMenu->updateLayout();
+
+    this->addChild(leftMenu);
+    this->addChild(menu);
 
     return true;
 }

src/layers/GYSettingSelectLayer.hpp

@@ -11,4 +11,5 @@ class GYSettingSelectLayer : public CCLayer {
     static GYSettingSelectLayer* create();
     bool init();
     void settingsBtn(CCObject* sender);
+    void backWrapper(CCObject* sender);
 };