From 7abb0fcda45e1bd972f1367f1114f94e518f7e08 Mon Sep 17 00:00:00 2001 From: shweet Date: Thu, 13 Nov 2025 22:09:13 -0500 Subject: [PATCH] ......Anm2Ed 2.0 --- src/imgui/documents.cpp | 9 ++++++--- src/imgui/taskbar.cpp | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/imgui/documents.cpp b/src/imgui/documents.cpp index 348fddc..5c45a5a 100644 --- a/src/imgui/documents.cpp +++ b/src/imgui/documents.cpp @@ -193,13 +193,16 @@ namespace anm2ed::imgui { if (document) { - DOCUMENT_EDIT_PTR(document, "Merge Anm2", Document::ALL, { + auto merge_anm2s = [&]() + { for (auto& path : manager.anm2DragDropPaths) { - anm2::Anm2 source(path); + anm2::Anm2 source(path.string()); document->anm2.merge(source, document->directory_get(), path.parent_path()); } - }); + }; + + DOCUMENT_EDIT_PTR(document, "Merge Anm2", Document::ALL, merge_anm2s()); drag_drop_reset(); } } diff --git a/src/imgui/taskbar.cpp b/src/imgui/taskbar.cpp index 4f71f71..49d9ab2 100644 --- a/src/imgui/taskbar.cpp +++ b/src/imgui/taskbar.cpp @@ -3,8 +3,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -693,7 +693,8 @@ namespace anm2ed::imgui if (type == render::PNGS) { - if (input_text_string("Format", &format)) format = std::filesystem::path(format).replace_extension(".png"); + if (input_text_string("Format", &format)) + format = std::filesystem::path(format).replace_extension(".png").string(); ImGui::SetItemTooltip( "For outputted images, each image will use this format.\n{} represents the index of each image."); }