lots of tweaks

Author: BlueWitherer

CONTRIBUTING.md

@@ -4,15 +4,15 @@ First off, thank you for considering contributing! We simply ask that you follow
 ## Pull Requests
 You're free to fork our repository and [open a pull request](../../pulls/) if you'd like to submit a new feature or propose a fix for an unknown issue.
 
-Before opening or marking your pull request as ready for review, please be sure to test your build and make sure it is stable and not conflicting with the upstream repository. Try not to diverge from our current code styling and practices in your fork.
+Before opening or marking your pull request as ready for review, please be sure to test your build and make sure it is stable and not conflicting with the upstream repository. Try not to diverge from our current code styling and practices in your branch.
 
 ### Practices
-The things you should always do and not do when opening a new pull request.
-- **Be clear!** Explain the important details of your changes, if not already obvious.
+The things you should always do and not do when opening a new pull request for this project.
+- **Be clear!** Explain the important details of and motives behind your changes, if not already obvious.
 - **Don't change versioning metadata.** Our maintainers will do that once it's been decided a new update should release soon.
-- **Don't write changelogs.** Maintainers will check back on changes and document everything!
-- **Isolate your changes.** Refrain from formatting or changing code outside of what you're actually working on to prevent conflicts.
-- **Get ready for feedback!** Sometimes not everything done does not meet the standard or is just questionable.
+- **Don't write changelogs.** Maintainers will check back on past changes and document everything!
+- **Isolate your changes.** Refrain from formatting or changing code outside of what you're actually working on in order to prevent conflicts.
+- **Get ready for feedback!** Sometimes not everything done meets the current standard or is just questionable.
 
 ### Guidelines
 This section mainly covers contributions for new features to Horrible Menu. For other pull requests, we simply ask that you justify your changes in detail when opening your request.

changelog.md

@@ -1,5 +1,11 @@
 # v1.1.0 
-- probably a feature update
+- Raise minimum Geode version support to `v5.4.0`
+- Added Automatic safe mode setting ([#6](https://github.com/CubicCommunity/HorribleMenu/pull/6))
+  - Added cheat marker to several options ([#6](https://github.com/CubicCommunity/HorribleMenu/pull/6))
+- Added information label to Safe Mode section in mod settings
+- Fix touch issues with category list and dropdown in options menu
+- Silliness filter dropdown in options menu now resets when clearing filters
+- Reworked *Horrible Options Menu* button section in mod settings
 
 # v1.0.3 
 - Added additional info button to *Safe Mode* label in options menu

mod.json

@@ -1,5 +1,5 @@
 {
-    "geode": "5.0.0",
+    "geode": "5.4.0",
     "gd": {
         "win": "2.2081",
         "android": "2.2081",
@@ -47,9 +47,13 @@
         }
     },
     "settings": {
-        "button": {
-            "type": "custom:menu",
-            "name": " "
+        "btn-popup": {
+            "type": "button",
+            "name": "Menu Button",
+            "buttons": {
+                "menu": "Horrible Options Menu"
+            },
+            "description": "Open the <cg>Horrible Options</c> menu."
         },
         "key-popup": {
             "type": "keybind",
@@ -65,6 +69,11 @@
             "name": "Safe Mode",
             "description": "Settings for Safe Mode."
         },
+        "safe-mode-info": {
+            "type": "info",
+            "description": "Safe Mode prevents you from accidentally saving progress in levels while using this mod's features.",
+            "color": "#00FF00"
+        },
         "safe-mode": {
             "type": "bool",
             "name": "Enable",

src/main.cpp

@@ -4,7 +4,6 @@
 
 #include <ui/Menu.h>
 #include <ui/MenuButton.h>
-#include <ui/SettingV3.h>
 
 #include <Geode/modify/PlayLayer.hpp>
 #include <Geode/modify/PauseLayer.hpp>
@@ -42,8 +41,6 @@ static void toggleSafeModeHooks(bool value) {
 };
 
 $on_game(Loaded) {
-    (void)mod->registerCustomSettingType("menu", &HorribleSettingV3::parse);
-
     if (auto om = OverlayManager::get()) {
         if (auto fb = MenuButton::get()) om->addChild(fb);
     };
@@ -117,6 +114,12 @@ static void toggleSafeModeHooks(bool value) {
             log::trace("Global options listener detected {} being {}, {}, {}", id, data.enabled ? "enabled" : "disabled", data.pin ? "pinned" : "unpinned", data.viewed ? "viewed" : "not viewed yet");
         });
 
+    ButtonSettingPressedEventV3(mod, "btn-popup")
+        .listen([](std::string_view buttonKey) {
+            if (buttonKey == "menu") menu::open();
+        })
+        .leak();
+
     OptionCheatingEvent()
         .listen([](bool cheating) {
             if (mod->getSettingValue<bool>(setting::DynamicSafeMode)) {

src/ui/Menu.h

@@ -28,6 +28,7 @@ namespace horrible {
 
         void setupSafeModeNode(bool safeMode);
         void setupImageBackground(fs::path const& path);
+        void setupSillyFilterDropdown(cocos2d::CCPoint const& pos);
 
     protected:
         Menu();

src/ui/SettingV3.h

@@ -43,9 +43,12 @@ class Menu::Impl final {
     std::string const theme = mod->getSettingValue<std::string>("theme");
 
     CCNode* safeModeContainer = nullptr;
+
     LazySprite* themeBackground = nullptr;
     CCClippingNode* themeBgContainer = nullptr;
 
+    cue::DropdownNode* sillyFilterDropdown = nullptr;
+
     std::vector<WeakRef<MenuCategoryFilterCell>> categoryItems;
 
     void filterOptions(std::vector<std::weak_ptr<Option>>&& optList, SillyTier tier = SillyTier::None, ZStringView category = "") {
@@ -200,6 +203,48 @@ void Menu::setupImageBackground(fs::path const& path) {
     };
 };
 
+void Menu::setupSillyFilterDropdown(CCPoint const& pos) {
+    cue::resetNode(m_impl->sillyFilterDropdown);
+
+    m_impl->sillyFilterDropdown = cue::DropdownNode::create(
+        to4B(colors::black, 0),
+        m_impl->categoryList->getScaledContentWidth(),
+        17.5f,
+        43.75f);
+    m_impl->sillyFilterDropdown->setID("silly-filter-dropdown");
+    m_impl->sillyFilterDropdown->setAnchorPoint({0.5, 1});
+    m_impl->sillyFilterDropdown->setPosition(pos);
+
+    m_impl->sillyFilterDropdown->setCallback([this](auto, CCNode* node) {
+        if (auto cell = typeinfo_cast<MenuSillyFilterCell*>(node)) {
+            if (m_impl->selectedTier != cell->getSillyTier()) m_impl->filterOptions(options::getAll(), cell->getSillyTier(), m_impl->selectedCategory);
+            m_impl->selectedTier = cell->getSillyTier();
+        };
+    });
+
+    constexpr TierFilterBtnData filterBtns[] = {
+        {SillyTier::None, "Any", "filter-none-btn", colors::white},
+        {SillyTier::Low, "Low", "filter-low-btn", colors::green},
+        {SillyTier::Medium, "Medium", "filter-medium-btn", colors::yellow},
+        {SillyTier::High, "High", "filter-high-btn", colors::red},
+    };
+
+    for (auto const& fBtn : filterBtns) {
+        if (auto cell = MenuSillyFilterCell::create(
+                {m_impl->sillyFilterDropdown->getScaledContentWidth(), 16.5f},
+                fBtn.tier,
+                fBtn.id,
+                fBtn.label,
+                fBtn.color)) {
+            m_impl->sillyFilterDropdown->addCell(cell);
+        } else {
+            log::error("Failed to create filter button");
+        };
+    };
+
+    m_mainLayer->addChild(m_impl->sillyFilterDropdown, 9);
+};
+
 bool Menu::init() {
     auto btns = themes::getCircleBaseColor(m_impl->theme);
 
@@ -289,8 +334,6 @@ bool Menu::init() {
     m_impl->categoryList->m_contentLayer->updateLayout();
     m_impl->categoryList->scrollToTop();
 
-    m_mainLayer->addChild(m_impl->categoryList, 9);
-
     auto categoryListBg = cue::createBackground(
         {m_impl->categoryList->getScaledContentWidth() + 7.5f, m_impl->categoryList->getScaledContentHeight() + 7.5f},
         {
@@ -367,45 +410,13 @@ bool Menu::init() {
 
     m_mainLayer->addChild(filterContainerLabel);
 
-    auto sillyDropdown = cue::DropdownNode::create(
-        to4B(colors::black, 0),
-        m_impl->categoryList->getScaledContentWidth(),
-        17.5f,
-        43.75f);
-    sillyDropdown->setID("silly-filter-dropdown");
-    sillyDropdown->setAnchorPoint({0.5, 1});
-    sillyDropdown->setPosition({filterContainerLabel->getPositionX(), 88.75f});
-
-    sillyDropdown->setCallback([this](auto, CCNode* node) {
-        if (auto cell = typeinfo_cast<MenuSillyFilterCell*>(node)) {
-            if (m_impl->selectedTier != cell->getSillyTier()) m_impl->filterOptions(options::getAll(), cell->getSillyTier(), m_impl->selectedCategory);
-            m_impl->selectedTier = cell->getSillyTier();
-        };
-    });
-
-    constexpr TierFilterBtnData filterBtns[] = {
-        {SillyTier::None, "Any", "filter-none-btn", colors::white},
-        {SillyTier::Low, "Low", "filter-low-btn", colors::green},
-        {SillyTier::Medium, "Medium", "filter-medium-btn", colors::yellow},
-        {SillyTier::High, "High", "filter-high-btn", colors::red},
-    };
-
-    for (auto const& fBtn : filterBtns) {
-        if (auto cell = MenuSillyFilterCell::create(
-                {sillyDropdown->getScaledContentWidth(), 16.5f},
-                fBtn.tier,
-                fBtn.id,
-                fBtn.label,
-                fBtn.color)) {
-            sillyDropdown->addCell(cell);
-        } else {
-            log::error("Failed to create filter button");
-        };
-    };
+    CCPoint const dropdownPos = {filterContainerLabel->getPositionX(), 88.75f};
+    setupSillyFilterDropdown(dropdownPos);
 
-    m_mainLayer->addChild(sillyDropdown, 9);
+    // adding now to fix touch issue with cue dropdown
+    m_mainLayer->addChild(m_impl->categoryList, 9);
 
-    m_mainLayer->addChild(m_impl->createFilterLabel("Silliness", "silly-filter-label", {m_impl->categoryList->getPositionX(), sillyDropdown->getPositionY() + 8.75f}), 1);
+    m_mainLayer->addChild(m_impl->createFilterLabel("Silliness", "silly-filter-label", {m_impl->categoryList->getPositionX(), m_impl->sillyFilterDropdown->getPositionY() + 8.75f}), 1);
 
     auto filterHint = SimpleTextArea::create(
         "Use different filters to search for certain options faster. Press the pin icon on an option cell to pin it to the top of the list.",
@@ -444,13 +455,13 @@ bool Menu::init() {
 
     auto resetFiltersBtn = Button::createWithNode(
         resetFiltersBtnSpr,
-        [this](auto) {
+        [this, dropdownPos](auto) {
             createQuickPopup(
                 "Reset Filters",
                 "Would you like to <cr>reset all search filters</c>?\n<cy>This will not clear your pins.</c>",
                 "Cancel",
                 "OK",
-                [this](auto, bool ok) {
+                [this, &dropdownPos](auto, bool ok) {
                     if (ok) {
                         m_impl->selectedTier = SillyTier::None;
                         m_impl->selectedCategory = "";
@@ -460,6 +471,7 @@ bool Menu::init() {
                         };
 
                         m_impl->filterOptions(options::getAll(), m_impl->selectedTier, m_impl->selectedCategory);
+                        setupSillyFilterDropdown(dropdownPos);
                     };
                 });
         });