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

Author: hiimjasmine00

.github/workflows/build.yml

@@ -41,6 +41,7 @@ jobs:
         uses: geode-sdk/build-geode-mod@main
         with:
           combine: true
+          sdk: nightly
           target: ${{ matrix.config.target }}
 
   package:

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.21)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)
     set(CMAKE_OSX_ARCHITECTURES "arm64")

include/API.hpp

@@ -168,6 +168,8 @@ namespace devtools {
     inline void sameLine() GEODE_EVENT_EXPORT_NORES(&sameLine, ());
     inline void separator() GEODE_EVENT_EXPORT_NORES(&separator, ());
     inline void nextItemWidth(float width) GEODE_EVENT_EXPORT_NORES(&nextItemWidth, (width));
+    inline void indent() GEODE_EVENT_EXPORT_NORES(&indent, ());
+    inline void unindent() GEODE_EVENT_EXPORT_NORES(&unindent, ());
 
     inline bool combo(
         char const* label,

src/API.cpp

@@ -56,6 +56,12 @@ void devtools::separator() {
 void devtools::nextItemWidth(float width) {
     ImGui::SetNextItemWidth(width);
 }
+void devtools::indent() {
+    ImGui::Indent(16.f);
+}
+void devtools::unindent() {
+    ImGui::Unindent(16.f);
+}
 bool devtools::combo(char const* label, int& current, std::span<char const*> items, int maxHeight) {
     return ImGui::Combo(
         label,

src/backend.cpp

@@ -486,6 +486,7 @@ ImGuiKey cocosToImGuiKey(cocos2d::enumKeyCodes key) {
 	}
 }
 
+#ifndef GEODE_IS_IOS
 class $modify(CCKeyboardDispatcher) {
     bool dispatchKeyboardMSG(enumKeyCodes key, bool down, bool repeat, double a4) {
         if(!DevTools::get()->isSetup()) return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, repeat, a4);
@@ -530,7 +531,7 @@ class $modify(CCKeyboardDispatcher) {
 		}
     }
 
-    #if defined(GEODE_IS_MACOS) || defined(GEODE_IS_IOS)
+    #if defined(GEODE_IS_MACOS)
     static void onModify(auto& self) {
         Result<> res = self.setHookPriorityBeforePre("CCKeyboardDispatcher::updateModifierKeys", "geode.custom-keybinds");
         if (!res) {
@@ -548,3 +549,4 @@ class $modify(CCKeyboardDispatcher) {
     }
     #endif
 };
+#endif

src/main.cpp

@@ -21,15 +21,17 @@ class $modify(CCNode) {
 };
 
 // todo: use shortcuts api once Geode has those
+#ifndef GEODE_IS_IOS
 class $modify(CCKeyboardDispatcher) {
-    bool dispatchKeyboardMSG(enumKeyCodes key, bool down, bool arr, double a4) {
+    bool dispatchKeyboardMSG(enumKeyCodes key, bool down, bool arr, double timestamp) {
         if (down && (key == KEY_F11 GEODE_MACOS(|| key == KEY_F10))) {
             DevTools::get()->toggle();
             return true;
         }
-        return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, arr, a4);
+        return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, arr, timestamp);
     }
 };
+#endif
 
 #include <Geode/loader/GameEvent.hpp>
 $execute {

src/pages/Tree.cpp

@@ -232,5 +232,4 @@ bool DevTools::searchBranch(CCNode* node) {
         }
     }
     return false;
-
 }