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

fixed issue with adding layers/nulls not having their base layer/null properties

Browse Source
This commit is contained in:
shweet
2025-12-26 18:07:16 -05:00
parent a8f38321ca
commit a6964c40bc
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/imgui/window/timeline.cpp
+15 -6
View File
@@ -1040,7 +1040,7 @@ namespace anm2ed::imgui
} }
playback.clamp(settings.playbackIsClamp ? length : anm2::FRAME_NUM_MAX); playback.clamp(settings.playbackIsClamp ? length : anm2::FRAME_NUM_MAX);
if (ImGui::IsMouseReleased(ImGuiMouseButton_Left)) isDragging = false; if (ImGui::IsMouseReleased(ImGuiMouseButton_Left)) isDragging = false;
if (length > 0) if (length > 0)
@@ -1786,7 +1786,8 @@ namespace anm2ed::imgui
ImGui::SetItemTooltip("%s", localize.get(TOOLTIP_ITEM_NAME)); ImGui::SetItemTooltip("%s", localize.get(TOOLTIP_ITEM_NAME));
if (type == anm2::LAYER) if (type == anm2::LAYER)
{ {
ImGui::Combo(localize.get(LABEL_SPRITESHEET), &addItemSpritesheetID, document.spritesheet.labels.data(), (int)document.spritesheet.labels.size()); ImGui::Combo(localize.get(LABEL_SPRITESHEET), &addItemSpritesheetID, document.spritesheet.labels.data(),
(int)document.spritesheet.labels.size());
ImGui::SetItemTooltip("%s", localize.get(TOOLTIP_LAYER_SPRITESHEET)); ImGui::SetItemTooltip("%s", localize.get(TOOLTIP_LAYER_SPRITESHEET));
} }
else if (type == anm2::NULL_) else if (type == anm2::NULL_)
@@ -1817,13 +1818,21 @@ namespace anm2ed::imgui
auto& layer = anm2.content.layers[id]; auto& layer = anm2.content.layers[id];
auto label = auto label =
std::vformat(localize.get(FORMAT_LAYER), std::make_format_args(id, layer.name, layer.spritesheetID)); std::vformat(localize.get(FORMAT_LAYER), std::make_format_args(id, layer.name, layer.spritesheetID));
if (ImGui::Selectable(label.c_str(), isSelected)) addItemID = id; if (ImGui::Selectable(label.c_str(), isSelected))
{
addItemID = id;
addItemSpritesheetID = layer.spritesheetID;
}
} }
else if (type == anm2::NULL_) else if (type == anm2::NULL_)
{ {
auto& null = anm2.content.nulls[id]; auto& null = anm2.content.nulls[id];
auto label = std::vformat(localize.get(FORMAT_NULL), std::make_format_args(id, null.name)); auto label = std::vformat(localize.get(FORMAT_NULL), std::make_format_args(id, null.name));
if (ImGui::Selectable(label.c_str(), isSelected)) addItemID = id; if (ImGui::Selectable(label.c_str(), isSelected))
{
addItemID = id;
addItemIsShowRect = null.isShowRect;
}
} }
ImGui::PopID(); ImGui::PopID();
@@ -1844,8 +1853,8 @@ namespace anm2ed::imgui
addReference = anm2.layer_animation_add({reference.animationIndex, anm2::LAYER, addItemID}, addItemName, addReference = anm2.layer_animation_add({reference.animationIndex, anm2::LAYER, addItemID}, addItemName,
addItemSpritesheetID, (destination::Type)destination); addItemSpritesheetID, (destination::Type)destination);
else if (type == anm2::NULL_) else if (type == anm2::NULL_)
addReference = anm2.null_animation_add({reference.animationIndex, anm2::NULL_, addItemID}, addItemName, addItemIsShowRect, addReference = anm2.null_animation_add({reference.animationIndex, anm2::NULL_, addItemID}, addItemName,
(destination::Type)destination); addItemIsShowRect, (destination::Type)destination);
document.change(Document::ITEMS); document.change(Document::ITEMS);