Merge pull request #101 from NuiCpp/devel

Added support for dispatch and mutable rpc lambdas.
NuiCpp · Dec 14, 2023 · 9eec1ba · 9eec1ba
2 parents fba94e2 + 353bc2a
commit 9eec1ba
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/nui/include/nui/backend/rpc_hub.hpp b/nui/include/nui/backend/rpc_hub.hpp
@@ -40,7 +40,7 @@ namespace Nui
             template <typename FunctionT>
             constexpr static auto wrapFunction(FunctionT&& func)
             {
-                return [func = std::move(func)](nlohmann::json const& args) {
+                return [func = std::move(func)](nlohmann::json const& args) mutable {
                     func(args);
                 };
             }
@@ -52,7 +52,7 @@ namespace Nui
             template <typename FunctionT>
             constexpr static auto wrapFunction(FunctionT&& func)
             {
-                return [func = std::move(func)](nlohmann::json const& args) {
+                return [func = std::move(func)](nlohmann::json const& args) mutable {
                     func(extractJsonMember<ArgsTypes>(args[Is])...);
                 };
             }

diff --git a/nui/include/nui/window.hpp b/nui/include/nui/window.hpp
@@ -283,6 +283,13 @@ namespace Nui
          */
         void run();
 
+        /**
+         * @brief Run a function on the main thread
+         *
+         * @param func
+         */
+        void dispatch(std::function<void()> func);
+
         /**
          * @brief Set page html from a string.
          *

diff --git a/nui/src/nui/backend/window.cpp b/nui/src/nui/backend/window.cpp
@@ -428,6 +428,12 @@ namespace Nui
         impl_->view->navigate("file://"s + file.string());
     }
     //---------------------------------------------------------------------------------------------------------------------
+    void Window::dispatch(std::function<void()> func)
+    {
+        std::scoped_lock lock{impl_->viewGuard};
+        impl_->view->dispatch(std::move(func));
+    }
+    //---------------------------------------------------------------------------------------------------------------------
     void Window::run()
     {
 #ifdef _WIN32