add DevTools::isButtonEnabled instead of using GEODE_DESKTOP everywhere

Author: Kingminer7

src/DevTools.cpp

@@ -34,7 +34,7 @@ struct matjson::Serialize<Settings> {
         assign(value["button_y"], s.buttonPos.y);
         assign(value["button_editor"], s.buttonInEditor);
         assign(value["button_game"], s.buttonInGame);
-        GEODE_DESKTOP(assign(value["button_enabled"], s.buttonEnabled);)
+        assign(value["button_enabled"], s.buttonEnabled);
         assign(value["tree_drag_reorder"], s.treeDragReorder);
 
         return Ok(s);
@@ -57,7 +57,7 @@ struct matjson::Serialize<Settings> {
             { "button_y", settings.buttonPos.y },
             { "button_editor", settings.buttonInEditor },
             { "button_game", settings.buttonInGame },
-            GEODE_DESKTOP({ "button_enabled", settings.buttonEnabled },)
+            { "button_enabled", settings.buttonEnabled },
             { "tree_drag_reorder", settings.treeDragReorder }
         });
     }
@@ -139,6 +139,14 @@ void DevTools::removeDragButton() {
     }
 }
 
+bool DevTools::isButtonEnabled() {
+#ifdef GEODE_IS_MOBILE
+    return true;
+#else
+    return m_settings.buttonEnabled;
+#endif
+}
+
 // Scroll when dragging empty space
 void mobileScrollBehavior() {
     auto* ctx = ImGui::GetCurrentContext();

src/DevTools.hpp

@@ -34,7 +34,7 @@ struct Settings {
     CCPoint buttonPos = {50, 50};
     bool buttonInEditor = false;
     bool buttonInGame = false;
-    GEODE_DESKTOP(bool buttonEnabled = false;)
+    bool buttonEnabled = false;
     bool treeDragReorder = false;
 };
 
@@ -126,6 +126,7 @@ class DevTools {
     DragButton* getDragButton();
     void setupDragButton();
     void removeDragButton();
+    bool isButtonEnabled();
 
     void sceneChanged();
 

src/main.cpp

@@ -36,7 +36,7 @@ class $modify(CCKeyboardDispatcher) {
 #include <Geode/loader/GameEvent.hpp>
 $execute {
     new EventListener<GameEventFilter>(+[](GameEvent*) {
-        GEODE_DESKTOP(if (DevTools::get()->getSettings().buttonEnabled)) DevTools::get()->setupDragButton();
+        if (DevTools::get()->isButtonEnabled()) DevTools::get()->setupDragButton();
     }, GameEventFilter(GameEventType::Loaded));
 }
 

src/pages/Settings.cpp

@@ -170,8 +170,8 @@ void DevTools::drawSettings() {
             "Shows the mobile button."
         );
     }
-    if (m_settings.buttonEnabled) {
 #endif
+    if (isButtonEnabled()) {
         ImGui::Checkbox("Button In Editor", &m_settings.buttonInEditor);
         if (ImGui::IsItemHovered()) {
             ImGui::SetTooltip(
@@ -184,9 +184,7 @@ void DevTools::drawSettings() {
                 "Shows the mobile button in levels."
             );
         }
-#ifdef GEODE_IS_DESKTOP
     }
-#endif
 
 #if 0
     static Ref<CCSet> PAUSED_TARGETS = nullptr;