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

fix issues with selecting null animations

Browse Source
This commit is contained in:
shweet
2025-11-19 21:52:15 -05:00
parent 6c6660d7c4
commit 2b356cbabf
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/imgui/window/timeline.cpp
View File

@@ -203,7 +203,6 @@ namespace anm2ed::imgui
auto item_selection_clear = [&]() auto item_selection_clear = [&]()
{ {
itemSelection.clear(); itemSelection.clear();
items.reference = -1;
}; };
auto item_selection_sync = [&]() auto item_selection_sync = [&]()
@@ -240,7 +239,6 @@ namespace anm2ed::imgui
{ {
if (itemSelection.empty()) if (itemSelection.empty())
{ {
items.reference = -1;
return; return;
} }
@@ -356,6 +354,7 @@ namespace anm2ed::imgui
{ {
reference = {reference.animationIndex, type, id}; reference = {reference.animationIndex, type, id};
frames_selection_reset(); frames_selection_reset();
if (type == anm2::LAYER || type == anm2::NULL_) items.reference = (int)type;
}; };
auto context_menu = [&]() auto context_menu = [&]()
@@ -461,7 +460,6 @@ namespace anm2ed::imgui
{ {
if (!animation) return false; if (!animation) return false;
auto& showUnused = settings.timelineIsShowUnused; auto& showUnused = settings.timelineIsShowUnused;
auto& showLayersOnly = settings.timelineIsOnlyShowLayers;
if (type == anm2::LAYER) if (type == anm2::LAYER)
{ {
for (auto id : animation->layerOrder) for (auto id : animation->layerOrder)
@@ -473,7 +471,6 @@ namespace anm2ed::imgui
} }
if (type == anm2::NULL_) if (type == anm2::NULL_)
{ {
if (showLayersOnly) return false;
for (auto& [id, nullAnimation] : animation->nullAnimations) for (auto& [id, nullAnimation] : animation->nullAnimations)
{ {
if (!showUnused && nullAnimation.frames.empty()) continue; if (!showUnused && nullAnimation.frames.empty()) continue;
@@ -489,7 +486,6 @@ namespace anm2ed::imgui
if (!animation || (type != anm2::LAYER && type != anm2::NULL_)) return; if (!animation || (type != anm2::LAYER && type != anm2::NULL_)) return;
auto& showUnused = settings.timelineIsShowUnused; auto& showUnused = settings.timelineIsShowUnused;
auto& showLayersOnly = settings.timelineIsOnlyShowLayers;
itemSelection.clear(); itemSelection.clear();
bool hasInserted = false; bool hasInserted = false;
@@ -508,7 +504,7 @@ namespace anm2ed::imgui
try_insert(id); try_insert(id);
} }
} }
else if (type == anm2::NULL_ && !showLayersOnly) else if (type == anm2::NULL_)
{ {
for (auto& [id, nullAnimation] : animation->nullAnimations) for (auto& [id, nullAnimation] : animation->nullAnimations)
{ {