better!

Author: TimeStepYT

CMakeLists.txt

@@ -9,7 +9,7 @@ else()
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 endif()
 
-project(NoStupidButtons VERSION 1.1.5)
+project(NoStupidButtons VERSION 1.2.1)
 
 add_library(${PROJECT_NAME} SHARED
     src/main.cpp

changelog.md

@@ -1,5 +1,9 @@
 # Changelog for NoStupidButtons
 
+## v1.2.1
+- Hiding now works by <cg>only setting the buttons invisible and telling the layout to ignore invisible children</c>, instead of <cr>brutally murdering them</c> (and possibly causing problems with other mods)!
+- iOS now doesn't remove the more games button if DevTools is enabled too!
+
 ## v1.2.0
 - Grayed out buttons in CreatorLayer are now able to be hidden!
 

mod.json

@@ -11,7 +11,7 @@
     },
     "id": "timestepyt.nostupidbuttons",
     "name": "NoStupidButtons",
-    "version": "v1.2.0",
+    "version": "v1.2.1",
     "developer": "TimeStepYT",
     "description": "This mod hides the buttons nobody uses!",
 
@@ -39,6 +39,12 @@
             "type": "bool",
             "default": true
         },
+        "reposition-robtop-logo": {
+            "name": "Reposition RobTop logo",
+            "description": "Repositions the RobTop logo in a way that I (the mod developer) find nicer to look at when hiding the social media buttons.",
+            "type": "bool",
+            "default": true
+        },
         "hide-robtop-logo": {
             "name": "Hide RobTop Logo",
             "description": "Toggles if the RobTop logo should be hidden in the Main Menu",

src/main.cpp

@@ -9,47 +9,84 @@ bool isSettingEnabled(std::string setting) {
     return Mod::get()->getSettingValue<bool>(setting);
 }
 
+void kys(CCNode* victim) {
+    victim->setVisible(false);
+}
+
+void ignoreInvisible(CCNode* menu) {
+    if (!menu) return;
+    
+    auto layout = menu->getLayout();
+    if (!layout) return;
+
+    layout->ignoreInvisibleChildren(true);
+}
+
 class $modify(MyMenuLayer, MenuLayer) {
-    bool init() override {
+    bool init() {
         if (!MenuLayer::init()) {
             return false;
         }
 
-        auto const bottomMenu = this->getChildByID("bottom-menu");
-        auto const socialMediaMenu = this->getChildByID("social-media-menu");
-        auto const moreGamesMenu = this->getChildByID("more-games-menu");
+        auto bottomMenu = this->getChildByID("bottom-menu");
+        auto socialMediaMenu = this->getChildByID("social-media-menu");
+        auto moreGamesMenu = this->getChildByID("more-games-menu");
+
+        ignoreInvisible(bottomMenu);
 
         if (isSettingEnabled("hide-newgrounds-button")) {
-            bottomMenu->removeChildByID("newgrounds-button");
+            auto ngBtn = bottomMenu->getChildByID("newgrounds-button");
+
+            kys(ngBtn);
+
             bottomMenu->updateLayout();
         }
 
-        if (isSettingEnabled("hide-social-media-buttons")) {
-            socialMediaMenu->removeChildByID("facebook-button");
-            socialMediaMenu->removeChildByID("twitter-button");
-            socialMediaMenu->removeChildByID("youtube-button");
-            socialMediaMenu->removeChildByID("twitch-button");
-            socialMediaMenu->removeChildByID("discord-button");
+        if (isSettingEnabled("hide-social-media-buttons") && socialMediaMenu) {
+            auto fbBtn = socialMediaMenu->getChildByID("facebook-button");
+            auto twitterBtn = socialMediaMenu->getChildByID("twitter-button");
+            auto ytBtn = socialMediaMenu->getChildByID("youtube-button");
+            auto twitchBtn = socialMediaMenu->getChildByID("twitch-button");
+            auto discordBtn = socialMediaMenu->getChildByID("discord-button");
+
+            ignoreInvisible(socialMediaMenu);
+
+            kys(fbBtn);
+            kys(twitterBtn);
+            kys(ytBtn);
+            kys(twitchBtn);
+            kys(discordBtn);
+            
             socialMediaMenu->updateLayout();
         }
-
+        
         if (isSettingEnabled("hide-robtop-logo")) {
-            socialMediaMenu->removeChildByID("robtop-logo-button");
+            auto robtopBtn = socialMediaMenu->getChildByID("robtop-logo-button");
+            
+            ignoreInvisible(socialMediaMenu);
+
+            kys(robtopBtn);
+            
             socialMediaMenu->updateLayout();
         }
-        else if (isSettingEnabled("hide-social-media-buttons")) {
+        else if (isSettingEnabled("hide-social-media-buttons") && isSettingEnabled("reposition-robtop-logo")) {
             CCNode* const robtopButtonNode = socialMediaMenu->getChildByID("robtop-logo-button");
             CCNode* const bottomMenuButton = bottomMenu->getChildByID("settings-button");
             robtopButtonNode->setPositionY(bottomMenuButton->getPositionY());
-            socialMediaMenu->updateLayout();
         }
 
-#ifdef GEODE_IS_ANDROID
+#ifdef GEODE_IS_MOBILE
         if (Loader::get()->isModLoaded("geode.devtools"))
             return true;
 #endif
+
         if (isSettingEnabled("hide-more-games-button")) {
-            moreGamesMenu->removeChildByID("more-games-button");
+            auto moreGamesButton = moreGamesMenu->getChildByID("more-games-button");
+
+            ignoreInvisible(moreGamesMenu);
+            
+            kys(moreGamesButton);
+
             moreGamesMenu->updateLayout();
         }
 
@@ -66,13 +103,15 @@ class $modify(MyCreatorLayer, CreatorLayer) {
 
         if (!creatorButtonsMenu) return true;
 
+        ignoreInvisible(creatorButtonsMenu);
+
         auto versusButton = creatorButtonsMenu->getChildByID("versus-button");
         auto mapButton = creatorButtonsMenu->getChildByID("map-button");
 
         if (isSettingEnabled("hide-versus-button"))
-            versusButton->removeMeAndCleanup();
+            kys(versusButton);
         if (isSettingEnabled("hide-map-button"))
-            mapButton->removeMeAndCleanup();
+            kys(mapButton);
         creatorButtonsMenu->updateLayout();
         return true;
     }