From 333c5e99814e7d314704f57cd8171c76685f3eb3 Mon Sep 17 00:00:00 2001 From: ww-rm Date: Sat, 14 Jun 2025 11:26:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B1=9E=E6=80=A7=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E9=A1=B9=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SpineViewer/Extensions/SpineObjectExtension.cs | 2 +- .../ViewModels/MainWindow/SpineObjectTabViewModel.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SpineViewer/Extensions/SpineObjectExtension.cs b/SpineViewer/Extensions/SpineObjectExtension.cs index 66a02b2..2d25ef8 100644 --- a/SpineViewer/Extensions/SpineObjectExtension.cs +++ b/SpineViewer/Extensions/SpineObjectExtension.cs @@ -49,7 +49,7 @@ namespace SpineViewer.Extensions public static Rect GetCurrentBounds(this SpineObject self) { self.Skeleton.GetBounds(out var x, out var y, out var w, out var h); - return new(x, y, w, h); + return new(x, y, Math.Max(w, 1e-6f), Math.Max(h, 1e-6f)); } /// diff --git a/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs b/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs index c092a14..6b24919 100644 --- a/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs +++ b/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs @@ -49,15 +49,15 @@ namespace SpineViewer.ViewModels.MainWindow IEnumerable commonSkinNames = _selectedObjects[0].Skins; foreach (var obj in _selectedObjects.Skip(1)) commonSkinNames = commonSkinNames.Intersect(obj.Skins); - foreach (var name in commonSkinNames) _skins.Add(new(name, _selectedObjects)); + foreach (var name in commonSkinNames.Order()) _skins.Add(new(name, _selectedObjects)); IEnumerable commonSlotNames = _selectedObjects[0].SlotAttachments.Keys; foreach (var obj in _selectedObjects.Skip(1)) commonSlotNames = commonSlotNames.Intersect(obj.SlotAttachments.Keys); - foreach (var name in commonSlotNames) _slots.Add(new(name, _selectedObjects)); + foreach (var name in commonSlotNames.Order()) _slots.Add(new(name, _selectedObjects)); IEnumerable commonTrackIndices = _selectedObjects[0].GetTrackIndices(); foreach (var obj in _selectedObjects.Skip(1)) commonTrackIndices = commonTrackIndices.Intersect(obj.GetTrackIndices()); - foreach (var idx in commonTrackIndices) _animationTracks.Add(new(idx, _selectedObjects)); + foreach (var idx in commonTrackIndices.Order()) _animationTracks.Add(new(idx, _selectedObjects)); } OnPropertyChanged();