tweak floating btn

Author: BlueWitherer

mod.json

@@ -79,7 +79,7 @@
                 "Geode"
             ]
         },
-        "floating-button": {
+        "floating-btn": {
             "type": "bool",
             "name": "Floating Menu Button",
             "description": "Show a floating button on the main menu to quickly access the <cg>Horrible Options</c> menu.",
@@ -90,14 +90,14 @@
                 "ios": true
             }
         },
-        "floating-button-level": {
+        "floating-btn-level": {
             "type": "bool",
             "name": "Show Button in Level",
             "description": "Show the floating menu button while playing a level.",
             "default": false,
-            "enable-if": "floating-button"
+            "enable-if": "floating-btn"
         },
-        "floating-button-scale": {
+        "floating-btn-scale": {
             "type": "float",
             "name": "Floating Button Scale",
             "description": "Change the size of the floating button.",
@@ -113,9 +113,9 @@
                 "big-arrows": true,
                 "big-arrow-step": 0.5
             },
-            "enable-if": "floating-button"
+            "enable-if": "floating-btn"
         },
-        "floating-button-opacity": {
+        "floating-btn-opacity": {
             "type": "int",
             "name": "Floating Button Opacity",
             "description": "Change the opacity of the floating button.",
@@ -131,7 +131,7 @@
                 "big-arrows": true,
                 "big-arrow-step": 20
             },
-            "enable-if": "floating-button"
+            "enable-if": "floating-btn"
         },
         "chances": {
             "type": "title",

src/Utils.hpp

@@ -49,7 +49,7 @@ namespace horrible {
     // For convenience
     namespace setting {
         inline constexpr auto SafeMode = "safe-mode";
-        inline constexpr auto FloatingBtn = "floating-button";
+        inline constexpr auto FloatingBtn = "floating-btn";
     };
 
     // Default option categories

src/main.cpp

@@ -69,19 +69,19 @@ inline static std::vector<Hook*> floatingBtnHooks;
         });
 
     listenForSettingChanges<bool>(
-        "floating-button-level",
+        "floating-btn-level",
         [](bool value) {
             if (auto fb = OptionMenuButton::get()) fb->setShowInLevel(value);
         });
 
     listenForSettingChanges<float>(
-        "floating-button-scale",
+        "floating-btn-scale",
         [](float value) {
             if (auto fb = OptionMenuButton::get()) fb->setScale(value);
         });
 
     listenForSettingChanges<int64_t>(
-        "floating-button-opacity",
+        "floating-btn-opacity",
         [](int64_t value) {
             if (auto fb = OptionMenuButton::get()) fb->setOpacity(value);
         });
@@ -126,7 +126,11 @@ class $modify(HIFloatBtnPauseLayer, PauseLayer) {
     HORRIBLE_HOOK_FLOATINGBTN;
 
     void customSetup() {
-        if (auto fb = OptionMenuButton::get()) fb->setVisible(horribleMod->getSettingValue<bool>(setting::FloatingBtn));
+        auto toggle = horribleMod->getSettingValue<bool>(setting::FloatingBtn);
+
+        log::trace("{} floating button", toggle ? "Showing" : "Hiding");
+        if (auto fb = OptionMenuButton::get()) fb->setVisible(toggle);
+
         PauseLayer::customSetup();
     };
 };
@@ -150,16 +154,17 @@ class $modify(HIFloatBtnPlayLayer, PlayLayer) {
     };
 
     void onQuit() {
-        toggleButton();
+        toggleButton(true);
         PlayLayer::onQuit();
     };
 
     void showEndLayer() {
-        PlayLayer::showEndLayer();
         toggleButton(true);
+        PlayLayer::showEndLayer();
     };
 
     void toggleButton(bool toggle = false) {
+        log::trace("{} floating button", toggle ? "Showing" : "Hiding");
         if (auto fb = OptionMenuButton::get()) fb->setVisible(horribleMod->getSettingValue<bool>(setting::FloatingBtn) && (fb->showInLevel() || toggle));
     };
 };

src/menu/src/OptionMenuButton.cpp

@@ -8,10 +8,10 @@ using namespace horrible::prelude;
 
 class OptionMenuButton::Impl final {
 public:
-    bool inLevel = horribleMod->getSettingValue<bool>("floating-button-level");
+    bool inLevel = horribleMod->getSettingValue<bool>("floating-btn-level");
 
-    float scale = horribleMod->getSettingValue<float>("floating-button-scale");
-    int64_t opacity = horribleMod->getSettingValue<int64_t>("floating-button-opacity");
+    float scale = horribleMod->getSettingValue<float>("floating-btn-scale");
+    int64_t opacity = horribleMod->getSettingValue<int64_t>("floating-btn-opacity");
 
     bool isDragging = false;
     bool isMoving = false;
@@ -43,7 +43,7 @@ void OptionMenuButton::setupSprite() {
     setScale(m_impl->scale);      // set initial scale
     setOpacity(m_impl->opacity);  // set initial opacity
 
-    setVisible(horribleMod->getSettingValue<bool>("floating-button"));  // set initial visibility
+    setVisible(horribleMod->getSettingValue<bool>("floating-btn"));  // set initial visibility
 
     addChild(m_impl->sprite);
 };
@@ -55,7 +55,7 @@ bool OptionMenuButton::init() {
     float x = horribleMod->getSavedValue<float>("button-x", 100.f);
     float y = horribleMod->getSavedValue<float>("button-y", 125.f);
 
-    setID("floating-button"_spr);
+    setID("floating-btn"_spr);
     setPosition({x, y});
     setAnchorPoint({0.5, 0.5});
     setTouchMode(kCCTouchesOneByOne);