NuiCpp · 5cript · Aug 19, 2023 · Jul 27, 2023 · Aug 19, 2023 · Aug 19, 2023
diff --git a/cmake/backend/emscripten.cmake b/cmake/backend/emscripten.cmake
@@ -31,7 +31,7 @@ else()
             "${CMAKE_BINARY_DIR}/_deps/emscripten-src/java/bin/java.exe"
             # not setting node, because global installed node might be preferred
             # "${CMAKE_BINARY_DIR}/_deps/emscripten-src/node/bin/node.exe"
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/_deps/emscripten-src
+        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/_deps/emscripten-src"
     )
 endif()
 add_custom_target(
@@ -92,13 +92,13 @@ function(nui_add_emscripten_target)
                 -DCMAKE_CXX_STANDARD=23 
                 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 
                 ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_CMAKE_OPTIONS} 
-                ${SOURCE_DIR}
+                "${SOURCE_DIR}"
         # copy over package.json and fill parcel options that do not exist on it
-        BUILD_COMMAND $<TARGET_FILE:parcel-adapter> ${SOURCE_DIR}/package.json ${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}/package.json "${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}"
+        BUILD_COMMAND $<TARGET_FILE:parcel-adapter> "${SOURCE_DIR}/package.json" "${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}/package.json" "${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}"
         # emscripten make
         COMMAND cmake --build "${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}" --target ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET} ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}-parcel
         # convert result to header file containing the page
-        COMMAND $<TARGET_FILE:bin2hpp> ${ENABLE_BIN2HPP} ${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}/bin/index.html ${CMAKE_BINARY_DIR}/include/index.hpp index
+        COMMAND $<TARGET_FILE:bin2hpp> ${ENABLE_BIN2HPP} "${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}/bin/index.html" "${CMAKE_BINARY_DIR}/include/index.hpp" index
         BINARY_DIR "${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}"
         BUILD_ALWAYS 1
         BUILD_BYPRODUCTS "${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}/bin/index.html"
@@ -110,20 +110,24 @@ function(nui_add_emscripten_target)
         ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}-prejs ALL
         DEPENDS ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_PREJS}
     )
+    add_custom_target(
+        ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}-parcel-dep 
+        DEPENDS ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}-emscripten
+    )
     add_dependencies(
         ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}-emscripten
         ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}-prejs
         emscripten-setup
     )
     add_dependencies(
         ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}
+        ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}-parcel-dep
         emscripten-setup
     )
-    set_property(TARGET ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET} PROPERTY OBJECT_DEPENDS "${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}/bin/index.html")
 
     if (${TARGET_TYPE} STREQUAL "INTERFACE_LIBRARY")
-        target_include_directories(${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET} INTERFACE ${CMAKE_BINARY_DIR}/include)
+        target_include_directories(${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET} INTERFACE "${CMAKE_BINARY_DIR}/include")
     else()
-        target_include_directories(${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET} PRIVATE ${CMAKE_BINARY_DIR}/include)
+        target_include_directories(${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET} PRIVATE "${CMAKE_BINARY_DIR}/include")
     endif()
 endfunction()
diff --git a/cmake/dependencies/boostpp.cmake b/cmake/dependencies/boostpp.cmake
@@ -1,5 +1,3 @@
-project(boost_preprocessor-git NONE)
-
 include(FetchContent)
 FetchContent_Declare(
     boost_preprocessor

diff --git a/cmake/dependencies/describe.cmake b/cmake/dependencies/describe.cmake
@@ -1,5 +1,3 @@
-project(boost_describe-git NONE)
-
 include(FetchContent)
 FetchContent_Declare(
     boost_describe 

diff --git a/cmake/dependencies/fmt.cmake b/cmake/dependencies/fmt.cmake
@@ -1,5 +1,3 @@
-project(fmt-git NONE)
-
 include(FetchContent)
 FetchContent_Declare(
     fmt

diff --git a/cmake/dependencies/gtest.cmake b/cmake/dependencies/gtest.cmake
@@ -1,5 +1,3 @@
-project(fmt-git NONE)
-
 include(FetchContent)
 FetchContent_Declare(
     gtest

diff --git a/cmake/dependencies/interval_tree.cmake b/cmake/dependencies/interval_tree.cmake
@@ -1,5 +1,3 @@
-project(interval-tree-git NONE)
-
 include(FetchContent)
 FetchContent_Declare(
     interval-tree

diff --git a/cmake/dependencies/libcpppre.cmake b/cmake/dependencies/libcpppre.cmake
@@ -1,5 +1,3 @@
-project(libcpppre-git NONE)
-
 include(FetchContent)
 FetchContent_Declare(
     libcpppre

diff --git a/cmake/dependencies/mp11.cmake b/cmake/dependencies/mp11.cmake
@@ -1,5 +1,3 @@
-project(boost_mp11-git NONE)
-
 include(FetchContent)
 FetchContent_Declare(
     boost_mp11

diff --git a/cmake/dependencies/mplex.cmake b/cmake/dependencies/mplex.cmake
@@ -1,5 +1,3 @@
-project(mplex-git NONE)
-
 include(FetchContent)
 FetchContent_Declare(
     mplex

diff --git a/cmake/dependencies/nlohmann_json.cmake b/cmake/dependencies/nlohmann_json.cmake
@@ -1,5 +1,3 @@
-project(nlohmann_json-git NONE)
-
 include(FetchContent)
 FetchContent_Declare(
     nlohmann_json

diff --git a/cmake/dependencies/portable_file_dialog.cmake b/cmake/dependencies/portable_file_dialog.cmake
@@ -1,5 +1,3 @@
-project(portable_file_dialogs-git NONE)
-
 # TODO: fork not necessary i think
 include(FetchContent)
 FetchContent_Declare(

diff --git a/cmake/dependencies/roar.cmake b/cmake/dependencies/roar.cmake
@@ -1,5 +1,3 @@
-project(roar-git NONE)
-
 include(FetchContent)
 FetchContent_Declare(
 	roar

diff --git a/cmake/dependencies/webview.cmake b/cmake/dependencies/webview.cmake
@@ -1,5 +1,3 @@
-project(webview-git NONE)
-
 if (UNIX)
     find_package(PkgConfig REQUIRED)
     pkg_check_modules(

diff --git a/cmake/frontend/emscripten.cmake b/cmake/frontend/emscripten.cmake
@@ -9,7 +9,7 @@ function(nui_prepare_emscripten_target)
 
     if (NOT NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_STATIC)
         get_target_property(NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_SOURCE_DIR ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET} SOURCE_DIR)
-        set(NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_STATIC ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_SOURCE_DIR}/static)
+        set(NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_STATIC "${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_SOURCE_DIR}/static")
     endif()
 
     nui_set_target_output_directories(${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET})
@@ -22,11 +22,12 @@ function(nui_prepare_emscripten_target)
 
     add_custom_target(
         ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET}-parcel 
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_STATIC} ${CMAKE_BINARY_DIR}/static
-        COMMAND ${CMAKE_BINARY_DIR}/node_modules/.bin/parcel build --dist-dir ${CMAKE_BINARY_DIR}/bin ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_PARCEL_ARGS}
-        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-        BYPRODUCTS ${CMAKE_BINARY_DIR}/bin/index.html
-        DEPENDS ${CMAKE_BINARY_DIR}/bin/index.js
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_FUNCTION_LIST_DIR}/../../nui/js" "${CMAKE_BINARY_DIR}/nui-js"
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_STATIC} "${CMAKE_BINARY_DIR}/static"
+        COMMAND "${CMAKE_BINARY_DIR}/node_modules/.bin/parcel" build --dist-dir "${CMAKE_BINARY_DIR}/bin" ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_PARCEL_ARGS}
+        WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+        BYPRODUCTS "${CMAKE_BINARY_DIR}/bin/index.html"
+        DEPENDS "${CMAKE_BINARY_DIR}/bin/index.js"
     )
 
     if (NOT NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_UNPACKED_MODE)
@@ -37,7 +38,7 @@ function(nui_prepare_emscripten_target)
         set(SINGLE_FILE_STRING "")
         add_custom_target(
             ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET}-copy-wasm
-            COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/bin/index.wasm ${CMAKE_BINARY_DIR}/../bin/index.wasm
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/bin/index.wasm" "${CMAKE_BINARY_DIR}/../bin/index.wasm"
         )
         add_dependencies(${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET}-parcel ${NUI_PREPARE_EMSCRIPTEN_TARGET_ARGS_TARGET}-copy-wasm)
     else()

diff --git a/nui/include/nui/window.hpp b/nui/include/nui/window.hpp
@@ -101,6 +101,15 @@ namespace Nui
          */
         void navigate(const std::string& url);
 
+#ifdef NUI_BACKEND
+        /**
+         * @brief Navigate to file.
+         *
+         * @param file path to an html file.
+         */
+        void navigate(const std::filesystem::path& file);
+#endif
+
         /**
          * @brief Close the window and exit run.
          */

diff --git a/nui/js/make_resizeable.js b/nui/js/make_resizeable.js
@@ -0,0 +1,46 @@
+// TODO: improve:
+
+const makeResizable = (element, borderSize, edge) => {
+    edge = edge || "right";
+
+    let pos;
+    const resize = (e) => {
+        const w = parseInt(getComputedStyle(element, '').width);
+        const h = parseInt(getComputedStyle(element, '').height);
+
+        if (edge === "right") {
+            const dx = -(pos - e.x);
+            pos = e.x;
+            element.style.width = (w + dx) + "px";
+        }
+        if (edge === "bottom") {
+            const dy = -(pos - e.y);
+            pos = e.y;
+            element.style.height = (h + dy) + "px";
+        }
+    }
+
+    element.addEventListener("mousedown", (e) => {
+        const w = parseInt(getComputedStyle(e.target, '').width);
+        const h = parseInt(getComputedStyle(e.target, '').height);
+
+        if (edge == "right") {
+            if (w - e.x < borderSize + 1 /*rounding tolerance*/) {
+                pos = e.x;
+                document.addEventListener("mousemove", resize, false);
+            }
+        }
+        if (edge == "bottom") {
+            if (h - e.y < borderSize + 1 /*rounding tolerance*/) {
+                pos = e.y;
+                document.addEventListener("mousemove", resize, false);
+            }
+        }
+    }, false);
+
+    document.addEventListener("mouseup", () => {
+        document.removeEventListener("mousemove", resize, false);
+    }, false);
+}
+
+export default makeResizable;
diff --git a/nui/src/nui/backend/window.cpp b/nui/src/nui/backend/window.cpp
@@ -249,6 +249,13 @@ namespace Nui
         impl_->view.navigate(url);
     }
     //---------------------------------------------------------------------------------------------------------------------
+    void Window::navigate(const std::filesystem::path& file)
+    {
+        using namespace std::string_literals;
+        std::scoped_lock lock{impl_->viewGuard};
+        impl_->view.navigate("file://"s + file.string());
+    }
+    //---------------------------------------------------------------------------------------------------------------------
     void Window::run()
     {
 #ifdef _WIN32

diff --git a/tools/parcel_adapter/main.cpp b/tools/parcel_adapter/main.cpp
@@ -24,6 +24,11 @@ void disablePolyfillIfNotSet(nlohmann::json& alias, std::string_view aliasName)
         alias[aliasName] = false;
 }
 
+void addNuiAlias(nlohmann::json& alias)
+{
+    alias["nui"] = "./nui-js";
+}
+
 void createPackageJsonIfMissing(std::filesystem::path const& where, std::string const& targetName)
 {
     using nlohmann::json;
@@ -88,6 +93,8 @@ int main(int argc, char** argv)
     if (!package.contains("alias"))
         package["alias"] = json::object();
 
+    addNuiAlias(package["alias"]);
+
     disablePolyfillIfNotSet(package["alias"], "assert");
     disablePolyfillIfNotSet(package["alias"], "fs");
     disablePolyfillIfNotSet(package["alias"], "buffer");