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

Author: HJfod

.gitignore

@@ -1,5 +1,6 @@
 
 # Workspace files are user-specific
+*.sublime-project
 *.sublime-workspace
 
 # I need to find a way to automatically remove this
@@ -17,4 +18,5 @@ Source/Geode/pkg/uber-apk-signer.jar
 imgui/**
 imgui
 
+**/.DS_Store
 .cache/

mod.json

@@ -1,6 +1,6 @@
 {
 	"geode": "v2.0.0",
-	"version": "v1.3.0",
+	"version": "v1.5.0",
 	"gd": "*",
 	"id": "geode.devtools",
 	"name": "DevTools",

src/DevTools.cpp

@@ -45,7 +45,7 @@ void DevTools::highlightNode(CCNode* node, HighlightMode mode) {
 }
 
 void DevTools::drawPage(const char* name, void(DevTools::*pageFun)()) {
-    if (ImGui::Begin(name)) {
+    if (ImGui::Begin(name, nullptr, ImGuiWindowFlags_HorizontalScrollbar)) {
         (this->*pageFun)();
     }
     ImGui::End();
@@ -188,8 +188,9 @@ void DevTools::setup() {
     this->setupPlatform();
 
 #ifdef GEODE_IS_MOBILE
-    ImGui::GetIO().FontGlobalScale = 3.f;
+    ImGui::GetIO().FontGlobalScale = 2.f;
     ImGui::GetStyle().ScrollbarSize = 60.f;
+    // ImGui::GetStyle().TabBarBorderSize = 60.f;
 #endif
 }
 
@@ -199,6 +200,10 @@ void DevTools::show(bool visible) {
 
 void DevTools::toggle() {
     this->show(!m_visible);
+    if (!m_visible) {
+        ImGui::GetIO().WantCaptureMouse = false;
+        ImGui::GetIO().WantCaptureKeyboard = false;
+    }
 }
 
 void DevTools::sceneChanged() {

src/pages/Attributes.cpp

@@ -217,6 +217,21 @@ void DevTools::drawNodeAttributes(CCNode* node) {
         }
     }
 
+    ImGui::NewLine();
+    ImGui::Separator();
+    ImGui::NewLine();
+
+    if (auto delegate = typeinfo_cast<CCTouchDelegate*>(node)) {
+        if (auto handler = CCTouchDispatcher::get()->findHandler(delegate)) {
+            auto priority = handler->getPriority();
+
+            if (ImGui::DragInt("Touch Priority", &priority, .03f)) {
+                CCTouchDispatcher::get()->setPriority(priority, handler->getDelegate());
+            }
+        }
+    }
+    
+
     ImGui::NewLine();
     ImGui::Separator();
     ImGui::NewLine();

src/pages/Settings.cpp

@@ -13,17 +13,22 @@ static float RAINBOW_HUE = 0.f;
 
 void DevTools::drawSettings() {
     ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { 1.f, 1.f });
+
+#ifdef GEODE_IS_MOBILE
+    ImGui::Dummy({0.f, 60.f});
+#endif
+
     // TODO: fix this option as it hasnt worked in a while lol
 #if 0
     ImGui::Checkbox("GD in Window", &m_GDInWindow);
     if (ImGui::IsItemHovered()) {
         ImGui::SetTooltip("Show GD inside a window when DevTools are open");
     }
-#endif
     ImGui::Checkbox("Attributes in Tree", &m_attributesInTree);
     if (ImGui::IsItemHovered()) {
         ImGui::SetTooltip("Show node attributes in the Tree");
     }
+#endif
     ImGui::Checkbox("Highlight Nodes", &m_alwaysHighlight);
     if (ImGui::IsItemHovered()) {
         ImGui::SetTooltip(
@@ -62,6 +67,10 @@ void DevTools::drawSettings() {
 
     ImGui::Separator();
 
+    ImGui::DragFloat("Font Size", &ImGui::GetIO().FontGlobalScale, 0.01f, 1.0f, 3.0f);
+
+    ImGui::Separator();
+
     ImGui::Text("GD Window");
 
     // TODO: undo later

src/pages/Tree.cpp

@@ -74,5 +74,9 @@ void DevTools::drawTreeBranch(CCNode* node, size_t index) {
 }
 
 void DevTools::drawTree() {
+#ifdef GEODE_IS_MOBILE
+    ImGui::Dummy({0.f, 60.f});
+#endif
+
     this->drawTreeBranch(CCDirector::get()->getRunningScene(), 0);
 }

src/platform/Android.cpp

@@ -7,7 +7,9 @@ using namespace geode::prelude;
 #include "utils.hpp"
 
 std::string formatAddressIntoOffsetImpl(uintptr_t addr) {
-    return fmt::format("idk + {:#x}", addr);
+    if (addr > base::get() && addr - 0x1000000 < base::get())
+        return fmt::format("libcocos2d.so + {:#x}", addr - base::get());
+    return fmt::format("{:#x}", addr);
 }
 
 #endif