Merge branch 'main' of https://github.com/geode-sdk/DevTools into drag-button

Author: Kingminer7

mod.json

@@ -1,5 +1,5 @@
 {
-	"geode": "4.3.1",
+	"geode": "4.4.0",
 	"version": "v1.8.0",
 	"gd": {
 		"win": "*",

src/DevTools.cpp

@@ -24,7 +24,9 @@ struct matjson::Serialize<Settings> {
             .orderChildren = value["order_children"].asBool().unwrapOr(std::move(defaults.orderChildren)),
             .advancedSettings = value["advanced_settings"].asBool().unwrapOr(std::move(defaults.advancedSettings)),
             .showMemoryViewer = value["show_memory_viewer"].asBool().unwrapOr(std::move(defaults.showMemoryViewer)),
+            .showModGraph = value["show_mod_graph"].asBool().unwrapOr(std::move(defaults.showModGraph)),
             .theme = value["theme"].asString().unwrapOr(std::move(defaults.theme)),
+            .themeColor = value["theme_color"].as<ccColor4B>().isOk() ? value["theme_color"].as<ccColor4B>().unwrap() : std::move(defaults.themeColor)
         });
     }
 
@@ -38,7 +40,9 @@ struct matjson::Serialize<Settings> {
             { "order_children", settings.orderChildren },
             { "advanced_settings", settings.advancedSettings },
             { "show_memory_viewer", settings.showMemoryViewer },
+            { "show_mod_graph", settings.showModGraph },
             { "theme", settings.theme },
+            { "theme_color", settings.themeColor },
         });
     }
 };
@@ -52,6 +56,7 @@ DevTools* DevTools::get() {
 
 void DevTools::loadSettings() { m_settings = Mod::get()->getSavedValue<Settings>("settings"); }
 void DevTools::saveSettings() { Mod::get()->setSavedValue("settings", m_settings); }
+Settings DevTools::getSettings() { return m_settings; }
 
 bool DevTools::shouldPopGame() const {
     return m_visible && m_settings.GDInWindow;
@@ -126,12 +131,15 @@ void DevTools::drawPages() {
         &DevTools::drawSettings
     );
 
+    // if advanced ever has more than one option, add it back
+#if 0
     if (m_settings.advancedSettings) {
         this->drawPage(
                 U8STR(FEATHER_SETTINGS " Advanced Settings###devtools/advanced/settings"),
                 &DevTools::drawAdvancedSettings
         );
     }
+#endif
 
     this->drawPage(
         U8STR(FEATHER_TOOL " Attributes###devtools/attributes"),
@@ -146,15 +154,18 @@ void DevTools::drawPages() {
     );
 #endif
 
-    if (m_showModGraph) {
+    if (m_settings.showModGraph) {
         this->drawPage(
             U8STR(FEATHER_SHARE_2 " Mod Graph###devtools/advanced/mod-graph"),
             &DevTools::drawModGraph
         );
     }
 
     if (m_settings.showMemoryViewer) {
-        this->drawPage("Memory viewer", &DevTools::drawMemory);
+        this->drawPage(
+            U8STR(FEATHER_TERMINAL " Memory viewer"), 
+            &DevTools::drawMemory
+        );
     }
 }
 

src/DevTools.hpp

@@ -26,7 +26,9 @@ struct Settings {
     bool orderChildren = true;
     bool advancedSettings = false;
     bool showMemoryViewer = false;
+    bool showModGraph = false;
     std::string theme = DARK_THEME;
+    ccColor4B themeColor = {2, 119, 189, 255};
 };
 
 class DevTools {
@@ -81,7 +83,7 @@ class DevTools {
     static DevTools* get();
     void loadSettings();
     void saveSettings();
-
+    Settings getSettings();
     bool shouldUseGDWindow() const;
 
     bool shouldPopGame() const;

src/pages/Advanced.cpp

@@ -7,7 +7,6 @@ using namespace geode::prelude;
 
 void DevTools::drawAdvancedSettings() {
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { 1.f, 1.f });
-    ImGui::Checkbox("Show Mod Graph", &m_showModGraph);
     ImGui::PopStyleVar();
 }