Merge branch 'main' into keybind-setting

Author: Kingminer7

include/API.hpp

@@ -27,7 +27,7 @@ namespace devtools {
     template <typename T>
     concept UnderlyingIntegral = std::is_integral_v<T> || std::is_integral_v<std::underlying_type_t<T>>;
 
-    struct RegisterNodeEvent final : geode::Event<RegisterNodeEvent, bool(geode::Function<void(cocos2d::CCNode*)>)> {
+    struct RegisterNodeEvent final : geode::Event<RegisterNodeEvent, bool(geode::Function<void(cocos2d::CCNode*)>&)> {
         using Event::Event;
     };
 
@@ -49,6 +49,10 @@ namespace devtools {
         return geode::Loader::get()->getLoadedMod("geode.devtools") != nullptr;
     }
 
+    /// @brief Checks if DevTools is currently open.
+    /// @return True if DevTools is open, false otherwise.
+    inline bool isOpen() GEODE_EVENT_EXPORT_NORES(&isOpen, ());
+
     /// @brief Waits for DevTools to be loaded and then calls the provided callback.
     /// @param callback The function to call once DevTools is loaded.
     template <typename F>
@@ -72,11 +76,13 @@ namespace devtools {
     /// @see `devtools::property`, `devtools::label`, `devtools::enumerable`, `devtools::button`
     template <typename T, std::invocable<std::remove_pointer_t<T>*> F> requires IsCCNode<T>
     void registerNode(F&& callback) {
-        RegisterNodeEvent().send([callback = std::forward<F>(callback)](cocos2d::CCNode* node) {
+        geode::Function<void(cocos2d::CCNode*)> func = [callback = std::forward<F>(callback)](cocos2d::CCNode* node) {
             if (auto casted = geode::cast::typeinfo_cast<std::remove_pointer_t<T>*>(node)) {
                 callback(casted);
             }
-        });
+        };
+
+        RegisterNodeEvent().send(func);
     }
 
     /// @brief Renders a property editor for the given value in the DevTools UI.

mod.json

@@ -1,9 +1,9 @@
 {
-	"geode": "5.0.0-beta.4",
-	"version": "v1.13.0",
+	"geode": "5.0.1",
+	"version": "v1.13.1",
 	"gd": {
 		"win": "2.2081",
-		"android": "*",
+		"android": "2.2081",
 		"mac": "2.2081",
 		"ios": "2.2081"
 	},

src/API.cpp

@@ -44,6 +44,9 @@ static void handleType() {
     }).leak();
 }
 
+bool devtools::isOpen() {
+    return DevTools::get()->isVisible();
+}
 void devtools::newLine() {
     ImGui::NewLine();
 }
@@ -87,7 +90,7 @@ bool devtools::button(ZStringView label) {
 }
 
 $execute {
-    devtools::RegisterNodeEvent().listen([](Function<void(CCNode*)> callback) {
+    devtools::RegisterNodeEvent().listen([](Function<void(CCNode*)>& callback) {
         DevTools::get()->addCustomCallback(std::move(callback));
         return ListenerResult::Stop;
     }).leak();

src/DevTools.cpp

@@ -112,7 +112,7 @@ void DevTools::setDraggedNode(CCNode* node) {
 }
 
 void DevTools::addCustomCallback(Function<void(CCNode*)>&& callback) {
-    m_customCallbacks.push_back(std::forward<Function<void(CCNode*)>>(callback));
+    m_customCallbacks.push_back(std::move(callback));
 }
 
 DragButton* DevTools::getDragButton() {