fix: path corrections

Author: stergiotis

skia/cmakelists.dhall

@@ -14,14 +14,6 @@ cmake.cmakelistsToText cmake.cmakelists::{
            }
 	, projectName = "imgui_skia_exe"
 	, cxxflags = ["-std=c++${Natural/show common.cppstd}" ] # common.cxxflags # common.stdlibFlags
-	--#  [ , "-I\${CMAKE_CURRENT_LIST_DIR}/../skia_minimal/imgui_w_hooks_1.91.9_wip"
-	--    , "-I\${CMAKE_CURRENT_LIST_DIR}/../skia_minimal/imgui_skia_impl"
-	--    , "-I\${CMAKE_CURRENT_LIST_DIR}/../skia_minimal/imgui_skia_driver_impl"
-	--    , "-I\${CMAKE_CURRENT_LIST_DIR}/../../contrib/skia"
-	--    , "-I\${CMAKE_CURRENT_LIST_DIR}/../../contrib/flatbuffers/include"
-	--    , "-I\${CMAKE_CURRENT_LIST_DIR}/../../contrib/sdl/include"
-	--    , "-I\${CMAKE_CURRENT_LIST_DIR}/../../contrib/tracy/public"
-	--    ]
 	, ldflags = common.ldflags # common.stdlibFlags
 	, sourceTreeParts = common.sourceTreeParts
 	, librarySourceTreeParts = common.librarySourceTreeParts
@@ -30,4 +22,4 @@ cmake.cmakelistsToText cmake.cmakelists::{
 }
 ++ "add_library(libimgui_skia STATIC IMPORTED)\n"
 ++ "set_target_properties(libimgui_skia PROPERTIES IMPORTED_LOCATION \"\${CMAKE_CURRENT_LIST_DIR}/../skia_minimal/build/libimgui_skia.a\")\n"
-++ "target_link_libraries(imzeroClientSkiaSdl3Impl libimgui_skia)\n"
+++ "target_link_libraries(imzeroClientSkiaSdl3Impl libimgui_skia)\n"

skia/dhall/sourceTreeParts.dhall

@@ -1,7 +1,7 @@
 let lib = ../../dhall/lib.dhall
 let prelude = ../../dhall/prelude.dhall
 let sourceTreePart = lib.sourceTreePart
-let path = \(loc : prelude.Location.Type) -> "${env:IMGUI_SKIA_CPP_ROOT as Text}/skia2/${lib.locationToString loc}"
+let path = \(loc : prelude.Location.Type) -> "${env:IMGUI_SKIA_CPP_ROOT as Text}/skia/${lib.locationToString loc}"
 let imguiImplot = let dir = path (../src/widgets/imgui_implot as Location) in sourceTreePart::{
 	, name = "imguiImplot"
 	, dir = dir

skia_minimal/imgui_skia_impl/imgui_skia_hooks_impl.cpp

@@ -209,7 +209,7 @@ namespace ImGui {
     bool Hooks::Global::Pre::RenderDimmedBackdgroundBehindWindow(::ImGuiWindow *window, ImU32 col) {
         return false;
     }
-    bool Hooks::Global::Pre::InputTextCalcTextSize(::ImVec2 &out, const ::ImGuiContext* ctx, const char* text_begin, const char* text_end, const char** remaining, ImVec2* out_offset, bool stop_on_new_line) {
+    bool Hooks::Global::Pre::InputTextCalcTextSize(::ImVec2 &out, ::ImGuiContext* ctx, const char* text_begin, const char* text_end, const char** remaining, ImVec2* out_offset, bool stop_on_new_line) {
         if (!ImGui::useVectorCmd) {
            return true;
         }
@@ -333,7 +333,7 @@ namespace ImGui {
     int Hooks::ImDrawListSplitter::MergeUpdate(::ImDrawListSplitter &splitter,int i,int prev) {
         return prev + static_cast<int>(splitter._ChannelsFbCmds[i]->size());
     }
-    void Hooks::ImDrawListSplitter::MergeReserve(const ::ImDrawList *drawList, const int n) {
+    void Hooks::ImDrawListSplitter::MergeReserve(::ImDrawList *drawList, const int n) {
         drawList->_FbCmds->reserve(drawList->_FbCmds->size() + n);
     }
     void Hooks::ImDrawListSplitter::MergeOp(::ImDrawListSplitter &splitter,::ImDrawList *drawList,int i) { ZoneScopedN("serialize and add split draw list");