chizui/SpineViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复模型添加顺序错误

Browse Source
This commit is contained in:
ww-rm
2025-10-02 09:32:17 +08:00
parent b32485e122
commit 0202027edb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SpineViewer/ViewModels/MainWindow/SpineObjectListViewModel.cs
View File

@@ -111,7 +111,7 @@ namespace SpineViewer.ViewModels.MainWindow
return;
if (!DialogService.ShowOpenFileDialog(out var atlasFileName, AppResource.Str_OpenAtlasFileTitle))
return;
AddSpineObject(skelFileName, atlasFileName);
InsertSpineObject(skelFileName, atlasFileName);
_logger.LogCurrentProcessMemoryUsage();
}
@@ -479,7 +479,7 @@ namespace SpineViewer.ViewModels.MainWindow
}
else if (validPaths.Count > 0)
{
AddSpineObject(validPaths[0]);
InsertSpineObject(validPaths[0]);
_logger.LogCurrentProcessMemoryUsage();
}
}
@@ -506,7 +506,7 @@ namespace SpineViewer.ViewModels.MainWindow
var skelPath = paths[i];
reporter.ProgressText = $"[{i}/{totalCount}] {skelPath}";
if (AddSpineObject(skelPath))
if (InsertSpineObject(skelPath))
success++;
else
error++;
@@ -529,7 +529,7 @@ namespace SpineViewer.ViewModels.MainWindow
/// 安全地在列表头添加一个模型, 发生错误会输出日志
/// </summary>
/// <returns>是否添加成功</returns>
private bool AddSpineObject(string skelPath, string? atlasPath = null)
private bool InsertSpineObject(string skelPath, string? atlasPath = null)
{
try
{
@@ -650,7 +650,7 @@ namespace SpineViewer.ViewModels.MainWindow
}
/// <summary>
/// 安全地在列表头添加一个模型, 发生错误会输出日志
/// 安全地在列表末尾添加一个模型, 发生错误会输出日志
/// </summary>
/// <returns>是否添加成功</returns>
private bool AddSpineObject(SpineObjectWorkspaceConfigModel cfg)
@@ -658,7 +658,7 @@ namespace SpineViewer.ViewModels.MainWindow
try
{
var sp = new SpineObjectModel(cfg);
lock (_spineObjectModels.Lock) _spineObjectModels.Insert(0, sp);
lock (_spineObjectModels.Lock) _spineObjectModels.Add(sp);
if (Application.Current.Dispatcher.CheckAccess())
{
RequestSelectionChanging?.Invoke(this, new(NotifyCollectionChangedAction.Reset));