shweet/anm2ed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

......Anm2Ed 2.0

Browse Source
This commit is contained in:
shweet
2025-11-13 22:09:13 -05:00
parent c57c32aca8
commit 7abb0fcda4
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/imgui/documents.cpp
View File

@@ -193,13 +193,16 @@ namespace anm2ed::imgui
{ {
if (document) if (document)
{ {
DOCUMENT_EDIT_PTR(document, "Merge Anm2", Document::ALL, { auto merge_anm2s = [&]()
{
for (auto& path : manager.anm2DragDropPaths) 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->anm2.merge(source, document->directory_get(), path.parent_path());
} }
}); };
DOCUMENT_EDIT_PTR(document, "Merge Anm2", Document::ALL, merge_anm2s());
drag_drop_reset(); drag_drop_reset();
} }
} }

5
src/imgui/taskbar.cpp
View File

@@ -3,8 +3,8 @@
#include <algorithm> #include <algorithm>
#include <array> #include <array>
#include <cfloat> #include <cfloat>
#include <cstddef>
#include <cmath> #include <cmath>
#include <cstddef>
#include <filesystem> #include <filesystem>
#include <format> #include <format>
#include <system_error> #include <system_error>
@@ -693,7 +693,8 @@ namespace anm2ed::imgui
if (type == render::PNGS) 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( ImGui::SetItemTooltip(
"For outputted images, each image will use this format.\n{} represents the index of each image."); "For outputted images, each image will use this format.\n{} represents the index of each image.");
} }