From 4c726083986ee61e965fefbda9d5ba31d00fd96f Mon Sep 17 00:00:00 2001
From: ww-rm <ww-rm@qq.com>
Date: Thu, 2 Oct 2025 11:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Exporters/FFmpegVideoExporterViewModel.cs    | 2 +-
 SpineViewer/ViewModels/Exporters/FrameExporterViewModel.cs  | 2 +-
 SpineViewer/ViewModels/MainWindow/PreferenceViewModel.cs    | 1 +
 SpineViewer/ViewModels/MainWindow/SFMLRendererViewModel.cs  | 2 +-
 .../ViewModels/MainWindow/SpineObjectTabViewModel.cs        | 2 +-
 .../Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml    | 6 +++---
 SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml  | 2 +-
 SpineViewer/Views/MainWindow.xaml                           | 4 ++--
 SpineViewer/Views/PreferenceDialog.xaml                     | 2 +-
 9 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/SpineViewer/ViewModels/Exporters/FFmpegVideoExporterViewModel.cs b/SpineViewer/ViewModels/Exporters/FFmpegVideoExporterViewModel.cs
index df86279..ed9d098 100644
--- a/SpineViewer/ViewModels/Exporters/FFmpegVideoExporterViewModel.cs
+++ b/SpineViewer/ViewModels/Exporters/FFmpegVideoExporterViewModel.cs
@@ -18,7 +18,7 @@ namespace SpineViewer.ViewModels.Exporters
 {
     public class FFmpegVideoExporterViewModel(MainWindowViewModel vmMain) : VideoExporterViewModel(vmMain)
     {
-        public ImmutableArray<FFmpegVideoExporter.VideoFormat> VideoFormatOptions { get; } = Enum.GetValues<FFmpegVideoExporter.VideoFormat>().ToImmutableArray();
+        public static ImmutableArray<FFmpegVideoExporter.VideoFormat> VideoFormatOptions { get; } = Enum.GetValues<FFmpegVideoExporter.VideoFormat>().ToImmutableArray();
 
         public FFmpegVideoExporter.VideoFormat Format { get => _format; set => SetProperty(ref _format, value); }
         protected FFmpegVideoExporter.VideoFormat _format = FFmpegVideoExporter.VideoFormat.Mp4;
diff --git a/SpineViewer/ViewModels/Exporters/FrameExporterViewModel.cs b/SpineViewer/ViewModels/Exporters/FrameExporterViewModel.cs
index d0e752c..a30363a 100644
--- a/SpineViewer/ViewModels/Exporters/FrameExporterViewModel.cs
+++ b/SpineViewer/ViewModels/Exporters/FrameExporterViewModel.cs
@@ -20,7 +20,7 @@ namespace SpineViewer.ViewModels.Exporters
 {
     public class FrameExporterViewModel(MainWindowViewModel vmMain) : BaseExporterViewModel(vmMain)
     {
-        public ImmutableArray<SKEncodedImageFormat> FrameFormatOptions { get; } = Enum.GetValues<SKEncodedImageFormat>().ToImmutableArray();
+        public static ImmutableArray<SKEncodedImageFormat> FrameFormatOptions { get; } = Enum.GetValues<SKEncodedImageFormat>().ToImmutableArray();
 
         public SKEncodedImageFormat Format { get => _format; set => SetProperty(ref _format, value); }
         protected SKEncodedImageFormat _format = SKEncodedImageFormat.Png;
diff --git a/SpineViewer/ViewModels/MainWindow/PreferenceViewModel.cs b/SpineViewer/ViewModels/MainWindow/PreferenceViewModel.cs
index bb38428..fa461c4 100644
--- a/SpineViewer/ViewModels/MainWindow/PreferenceViewModel.cs
+++ b/SpineViewer/ViewModels/MainWindow/PreferenceViewModel.cs
@@ -3,6 +3,7 @@ using CommunityToolkit.Mvvm.Input;
 using Microsoft.Win32;
 using NLog;
 using Spine.Implementations;
+using Spine.Interfaces;
 using SpineViewer.Models;
 using SpineViewer.Natives;
 using SpineViewer.Services;
diff --git a/SpineViewer/ViewModels/MainWindow/SFMLRendererViewModel.cs b/SpineViewer/ViewModels/MainWindow/SFMLRendererViewModel.cs
index 8ac6320..590b0fe 100644
--- a/SpineViewer/ViewModels/MainWindow/SFMLRendererViewModel.cs
+++ b/SpineViewer/ViewModels/MainWindow/SFMLRendererViewModel.cs
@@ -25,7 +25,7 @@ namespace SpineViewer.ViewModels.MainWindow
 {
     public class SFMLRendererViewModel : ObservableObject
     {
-        public ImmutableArray<Stretch> StretchOptions { get; } = Enum.GetValues<Stretch>().ToImmutableArray();
+        public static ImmutableArray<Stretch> StretchOptions { get; } = Enum.GetValues<Stretch>().ToImmutableArray();
 
         /// <summary>
         /// 日志器
diff --git a/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs b/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs
index 8f7bc69..444d25f 100644
--- a/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs
+++ b/SpineViewer/ViewModels/MainWindow/SpineObjectTabViewModel.cs
@@ -18,7 +18,7 @@ namespace SpineViewer.ViewModels.MainWindow
         private readonly ObservableCollection<SlotViewModel> _slots = [];
         private readonly ObservableCollection<AnimationTrackViewModel> _animationTracks = [];
 
-        public ImmutableArray<ISkeleton.Physics> PhysicsOptions { get; } = Enum.GetValues<ISkeleton.Physics>().ToImmutableArray();
+        public static ImmutableArray<ISkeleton.Physics> PhysicsOptions { get; } = Enum.GetValues<ISkeleton.Physics>().ToImmutableArray();
 
         public SpineObjectModel[] SelectedObjects
         {
diff --git a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
index 0260264..2969bad 100644
--- a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
@@ -5,8 +5,8 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:hc="https://handyorg.github.io/handycontrol"
         xmlns:local="clr-namespace:SpineViewer.Views.ExporterDialogs"
-        xmlns:exporters="clr-namespace:SpineViewer.ViewModels.Exporters"
-        d:DataContext="{d:DesignInstance Type=exporters:FFmpegVideoExporterViewModel}"
+        xmlns:vmexp="clr-namespace:SpineViewer.ViewModels.Exporters"
+        d:DataContext="{d:DesignInstance Type=vmexp:FFmpegVideoExporterViewModel}"
         mc:Ignorable="d"
         Title="{DynamicResource Str_FFmpegVideoExporterTitle}"
         Width="450"
@@ -161,7 +161,7 @@
 
                             <!-- 视频格式 -->
                             <Label Grid.Row="0" Grid.Column="0" Content="{DynamicResource Str_VideoFormat}"/>
-                            <ComboBox Grid.Row="0" Grid.Column="1" SelectedItem="{Binding Format}" ItemsSource="{Binding VideoFormatOptions}"/>
+                            <ComboBox Grid.Row="0" Grid.Column="1" SelectedItem="{Binding Format}" ItemsSource="{x:Static vmexp:FFmpegVideoExporterViewModel.VideoFormatOptions}"/>
 
                             <!-- 动图是否循环 -->
                             <Label Grid.Row="1" Grid.Column="0" Content="{DynamicResource Str_LoopPlay}" ToolTip="{DynamicResource Str_LoopPlayTooltip}"/>
diff --git a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
index 7a94059..ce655f0 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
@@ -126,7 +126,7 @@
 
                             <!-- 图像格式 -->
                             <Label Grid.Row="0" Grid.Column="0" Content="{DynamicResource Str_ImageFormat}"/>
-                            <ComboBox Grid.Row="0" Grid.Column="1" SelectedItem="{Binding Format}" ItemsSource="{Binding FrameFormatOptions}"/>
+                            <ComboBox Grid.Row="0" Grid.Column="1" SelectedItem="{Binding Format}" ItemsSource="{x:Static vmexp:FrameExporterViewModel.FrameFormatOptions}"/>
 
                             <!-- 图像质量 -->
                             <Label Grid.Row="1" Grid.Column="0" Content="{DynamicResource Str_ImageQuality}" ToolTip="{DynamicResource Str_ImageQualityTooltip}"/>
diff --git a/SpineViewer/Views/MainWindow.xaml b/SpineViewer/Views/MainWindow.xaml
index 6fad453..3aeead4 100644
--- a/SpineViewer/Views/MainWindow.xaml
+++ b/SpineViewer/Views/MainWindow.xaml
@@ -327,7 +327,7 @@
 
                                                 <!-- 物理 -->
                                                 <Label Grid.Row="2" Grid.Column="0" Content="{DynamicResource Str_Physics}"/>
-                                                <ComboBox Grid.Row="2" Grid.Column="1" SelectedValue="{Binding Physics}" ItemsSource="{Binding PhysicsOptions}"/>
+                                                <ComboBox Grid.Row="2" Grid.Column="1" SelectedValue="{Binding Physics}" ItemsSource="{x:Static vm:SpineObjectTabViewModel.PhysicsOptions}"/>
 
                                                 <!-- 时间因子 -->
                                                 <Label Grid.Row="3" Grid.Column="0" Content="{DynamicResource Str_TimeScale}" ToolTip="{DynamicResource Str_TimeScaleTootltip}"/>
@@ -790,7 +790,7 @@
 
                                     <!-- 背景图案模式 -->
                                     <Label Grid.Row="14" Grid.Column="0" Content="{DynamicResource Str_BackgroundImageMode}"/>
-                                    <ComboBox Grid.Row="14" Grid.Column="1" SelectedValue="{Binding BackgroundImageMode}" ItemsSource="{Binding StretchOptions}"/>
+                                    <ComboBox Grid.Row="14" Grid.Column="1" SelectedValue="{Binding BackgroundImageMode}" ItemsSource="{x:Static vm:SFMLRendererViewModel.StretchOptions}"/>
                                 </Grid>
                             </TabItem>
                         </TabControl>
diff --git a/SpineViewer/Views/PreferenceDialog.xaml b/SpineViewer/Views/PreferenceDialog.xaml
index b139ae2..4721c9c 100644
--- a/SpineViewer/Views/PreferenceDialog.xaml
+++ b/SpineViewer/Views/PreferenceDialog.xaml
@@ -51,7 +51,7 @@
                 </Style>
             </Border.Resources>
             <ScrollViewer  VerticalScrollBarVisibility="Auto">
-                <StackPanel Grid.IsSharedSizeScope="True">
+                <StackPanel Grid.IsSharedSizeScope="True" Margin="0 0 0 50">
                     <GroupBox Header="{DynamicResource Str_TextureLoadPreference}">
                         <StackPanel>
                             <Grid>