From a1a077779184f8c86e0391ba78bbf86bf7277249 Mon Sep 17 00:00:00 2001
From: ww-rm <ww-rm@qq.com>
Date: Fri, 3 Oct 2025 22:22:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SpineViewer/App.xaml                          |  21 +-
 SpineViewer/Resources/Theme.xaml              |  80 ++-
 .../CustomFFmpegExporterDialog.xaml           |  13 +-
 .../FFmpegVideoExporterDialog.xaml            |  11 +-
 .../ExporterDialogs/FrameExporterDialog.xaml  |  11 +-
 .../FrameSequenceExporterDialog.xaml          |  11 +-
 SpineViewer/Views/MainWindow.xaml             | 497 ++++++++----------
 SpineViewer/Views/PreferenceDialog.xaml       |  11 +-
 8 files changed, 325 insertions(+), 330 deletions(-)

diff --git a/SpineViewer/App.xaml b/SpineViewer/App.xaml
index a8ce080..50be1d7 100644
--- a/SpineViewer/App.xaml
+++ b/SpineViewer/App.xaml
@@ -8,28 +8,11 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Resources/Skins/Light.xaml"/>
-                <ResourceDictionary Source="/Resources/Theme.xaml"/>
                 <ResourceDictionary Source="/Resources/Geometries.xaml"/>
                 <ResourceDictionary Source="/Resources/Strings/zh.xaml"/>
+                <ResourceDictionary Source="/Resources/Skins/Light.xaml"/>
+                <ResourceDictionary Source="/Resources/Theme.xaml"/>
             </ResourceDictionary.MergedDictionaries>
-
-            <Style x:Key="MyToggleButton" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ToggleButtonSwitch}">
-                <Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource DarkSuccessBrush}"/>
-            </Style>
-
-            <Style TargetType="{x:Type ListBox}" BasedOn="{StaticResource ListBoxBaseStyle}">
-                <Setter Property="SelectionMode" Value="Extended"/>
-                <Setter Property="VirtualizingPanel.IsVirtualizing" Value="False"/>
-                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Visible"/>
-            </Style>
-
-            <Style TargetType="{x:Type ListView}" BasedOn="{StaticResource ListViewBaseStyle}">
-                <Setter Property="SelectionMode" Value="Extended"/>
-                <Setter Property="VirtualizingPanel.IsVirtualizing" Value="False"/>
-                <Setter Property="Background" Value="Transparent"/>
-            </Style>
-
         </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/SpineViewer/Resources/Theme.xaml b/SpineViewer/Resources/Theme.xaml
index ed1bc87..89ffdbd 100644
--- a/SpineViewer/Resources/Theme.xaml
+++ b/SpineViewer/Resources/Theme.xaml
@@ -1,5 +1,83 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:o="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
+                    xmlns:utils="clr-namespace:SpineViewer.Utils"
+                    xmlns:hc="https://handyorg.github.io/handycontrol">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
     </ResourceDictionary.MergedDictionaries>
+
+    <utils:StringFormatMultiValueConverter x:Key="StrFmtCvter"/>
+    <utils:BackgroundToForegroundConverter x:Key="Bg2FgCvter"/>
+
+    <Style x:Key="MyGridSplitterBaseStyle" TargetType="{x:Type GridSplitter}">
+        <Setter Property="Background" Value="{DynamicResource SecondaryBorderBrush}"/>
+        <Setter Property="ShowsPreview" Value="False"/>
+        <Style.Triggers>
+            <Trigger Property="ResizeDirection" Value="Columns">
+                <Setter Property="Width" Value="3"/>
+                <Setter Property="HorizontalAlignment" Value="Center"/>
+                <Setter Property="VerticalAlignment" Value="Stretch"/>
+            </Trigger>
+            <Trigger Property="ResizeDirection" Value="Rows">
+                <Setter Property="Height" Value="3"/>
+                <Setter Property="VerticalAlignment" Value="Center"/>
+                <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="MyToggleButtonBaseStyle" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ToggleButtonSwitch}">
+        <Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource DarkSuccessBrush}"/>
+    </Style>
+
+    <Style x:Key="MyListBoxBaseStyle" TargetType="{x:Type ListBox}" BasedOn="{StaticResource ListBoxBaseStyle}">
+        <Setter Property="SelectionMode" Value="Extended"/>
+        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="False"/>
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Visible"/>
+    </Style>
+
+    <Style x:Key="MyListBoxItemBaseStyle" TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource ListBoxItemBaseStyle}">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="Margin" Value="0"/>
+    </Style>
+
+    <Style x:Key="MyListViewBaseStyle" TargetType="{x:Type ListView}" BasedOn="{StaticResource ListViewBaseStyle}">
+        <Setter Property="SelectionMode" Value="Extended"/>
+        <Setter Property="VirtualizingPanel.IsVirtualizing" Value="False"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource ListViewItemBaseStyle.Small}"/>
+    </Style>
+
+    <Style x:Key="MyGroupBoxBaseStyle" TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="hc:TitleElement.Background" Value="Transparent"/>
+    </Style>
+
+    <Style x:Key="MyLogRichTextBoxStyle" TargetType="{x:Type RichTextBox}" BasedOn="{StaticResource RichTextBoxBaseStyle}">
+        <Setter Property="IsReadOnly" Value="True"/>
+        <Setter Property="FontFamily" Value="Consolas"/>
+        <Setter Property="Block.LineHeight" Value="3"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Visible"/>
+    </Style>
+
+    <Style x:Key="MyVerticalScrollViewerBaseStyle" TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource ScrollViewerNativeBaseStyle}">
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
+        <Style.Triggers>
+            <Trigger Property="ComputedVerticalScrollBarVisibility" Value="Visible">
+                <Setter Property="Padding" Value="0 0 5 0"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style TargetType="{x:Type GridSplitter}" BasedOn="{StaticResource MyGridSplitterBaseStyle}"/>
+    <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButtonBaseStyle}"/>
+    <Style TargetType="{x:Type ListBox}" BasedOn="{StaticResource MyListBoxBaseStyle}"/>
+    <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource MyListBoxItemBaseStyle}"/>
+    <Style TargetType="{x:Type ListView}" BasedOn="{StaticResource MyListViewBaseStyle}"/>
+    <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource MyGroupBoxBaseStyle}"/>
+
 </ResourceDictionary>
diff --git a/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
index 84329b6..4f2867c 100644
--- a/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
@@ -15,9 +15,6 @@
         Height="800"
         ShowInTaskbar="False"
         WindowStartupLocation="CenterOwner">
-    <Window.Resources>
-        <utils:BackgroundToForegroundConverter x:Key="Bg2FgCvter"/>
-    </Window.Resources>
     <DockPanel>
         <Border DockPanel.Dock="Bottom">
             <WrapPanel HorizontalAlignment="Center">
@@ -44,17 +41,15 @@
                 <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource ComboBoxBaseStyle}">
                     <Setter Property="HorizontalContentAlignment" Value="Right"/>
                 </Style>
-                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButton}">
+                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButtonBaseStyle}">
                     <Setter Property="HorizontalAlignment" Value="Right"/>
                 </Style>
-                <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
-                    <Setter Property="Background" Value="Transparent"/>
-                    <Setter Property="hc:TitleElement.Background" Value="Transparent"/>
+                <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource MyGroupBoxBaseStyle}">
                     <Setter Property="Margin" Value="0 5 0 10"/>
                 </Style>
             </Border.Resources>
-            
-            <ScrollViewer VerticalScrollBarVisibility="Auto">
+
+            <ScrollViewer Style="{StaticResource MyVerticalScrollViewerBaseStyle}">
                 <StackPanel Grid.IsSharedSizeScope="True">
                     <GroupBox Header="{DynamicResource Str_ExportBaseArgs}">
                         <StackPanel>
diff --git a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
index fffca07..1d60ef6 100644
--- a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
@@ -15,9 +15,6 @@
         Height="750"
         ShowInTaskbar="False"
         WindowStartupLocation="CenterOwner">
-    <Window.Resources>
-        <utils:BackgroundToForegroundConverter x:Key="Bg2FgCvter"/>
-    </Window.Resources>
     <DockPanel>
         <Border DockPanel.Dock="Bottom">
             <WrapPanel HorizontalAlignment="Center">
@@ -44,17 +41,15 @@
                 <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource ComboBoxBaseStyle}">
                     <Setter Property="HorizontalContentAlignment" Value="Right"/>
                 </Style>
-                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButton}">
+                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButtonBaseStyle}">
                     <Setter Property="HorizontalAlignment" Value="Right"/>
                 </Style>
-                <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
-                    <Setter Property="Background" Value="Transparent"/>
-                    <Setter Property="hc:TitleElement.Background" Value="Transparent"/>
+                <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource MyGroupBoxBaseStyle}">
                     <Setter Property="Margin" Value="0 5 0 10"/>
                 </Style>
             </Border.Resources>
 
-            <ScrollViewer VerticalScrollBarVisibility="Auto">
+            <ScrollViewer Style="{StaticResource MyVerticalScrollViewerBaseStyle}">
                 <StackPanel Grid.IsSharedSizeScope="True">
                     <GroupBox Header="{DynamicResource Str_ExportBaseArgs}">
                         <StackPanel>
diff --git a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
index b90a980..2da3a98 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
@@ -15,9 +15,6 @@
         Height="480"
         ShowInTaskbar="False"
         WindowStartupLocation="CenterOwner">
-    <Window.Resources>
-        <utils:BackgroundToForegroundConverter x:Key="Bg2FgCvter"/>
-    </Window.Resources>
     <DockPanel>
         <Border DockPanel.Dock="Bottom">
             <WrapPanel HorizontalAlignment="Center">
@@ -44,17 +41,15 @@
                 <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource ComboBoxBaseStyle}">
                     <Setter Property="HorizontalContentAlignment" Value="Right"/>
                 </Style>
-                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButton}">
+                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButtonBaseStyle}">
                     <Setter Property="HorizontalAlignment" Value="Right"/>
                 </Style>
-                <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
-                    <Setter Property="Background" Value="Transparent"/>
-                    <Setter Property="hc:TitleElement.Background" Value="Transparent"/>
+                <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource MyGroupBoxBaseStyle}">
                     <Setter Property="Margin" Value="0 5 0 10"/>
                 </Style>
             </Border.Resources>
 
-            <ScrollViewer VerticalScrollBarVisibility="Auto">
+            <ScrollViewer Style="{StaticResource MyVerticalScrollViewerBaseStyle}">
                 <StackPanel Grid.IsSharedSizeScope="True">
                     <GroupBox Header="{DynamicResource Str_ExportBaseArgs}">
                         <StackPanel>
diff --git a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
index 991f513..6688872 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
@@ -15,9 +15,6 @@
         Height="550"
         ShowInTaskbar="False"
         WindowStartupLocation="CenterOwner">
-    <Window.Resources>
-        <utils:BackgroundToForegroundConverter x:Key="Bg2FgCvter"/>
-    </Window.Resources>
     <DockPanel>
         <Border DockPanel.Dock="Bottom">
             <WrapPanel HorizontalAlignment="Center">
@@ -44,17 +41,15 @@
                 <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource ComboBoxBaseStyle}">
                     <Setter Property="HorizontalContentAlignment" Value="Right"/>
                 </Style>
-                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButton}">
+                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButtonBaseStyle}">
                     <Setter Property="HorizontalAlignment" Value="Right"/>
                 </Style>
-                <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
-                    <Setter Property="Background" Value="Transparent"/>
-                    <Setter Property="hc:TitleElement.Background" Value="Transparent"/>
+                <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource MyGroupBoxBaseStyle}">
                     <Setter Property="Margin" Value="0 5 0 10"/>
                 </Style>
             </Border.Resources>
 
-            <ScrollViewer VerticalScrollBarVisibility="Auto">
+            <ScrollViewer Style="{StaticResource MyVerticalScrollViewerBaseStyle}">
                 <StackPanel Grid.IsSharedSizeScope="True">
                     <GroupBox Header="{DynamicResource Str_ExportBaseArgs}">
                         <StackPanel>
diff --git a/SpineViewer/Views/MainWindow.xaml b/SpineViewer/Views/MainWindow.xaml
index 2999035..2949858 100644
--- a/SpineViewer/Views/MainWindow.xaml
+++ b/SpineViewer/Views/MainWindow.xaml
@@ -6,7 +6,6 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:hc="https://handyorg.github.io/handycontrol"
         xmlns:vm="clr-namespace:SpineViewer.ViewModels.MainWindow"
-        xmlns:utils="clr-namespace:SpineViewer.Utils"
         xmlns:SFMLRenderer="clr-namespace:SFMLRenderer;assembly=SFMLRenderer"
         mc:Ignorable="d"
         x:Name="_mainWindow"
@@ -20,27 +19,6 @@
         LocationChanged="MainWindow_LocationChanged"
         SizeChanged="MainWindow_SizeChanged">
 
-    <Window.Resources>
-        <Style TargetType="{x:Type GridSplitter}">
-            <Setter Property="Background" Value="{DynamicResource SecondaryBorderBrush}"/>
-            <Setter Property="ShowsPreview" Value="False"/>
-            <Style.Triggers>
-                <Trigger Property="ResizeDirection" Value="Columns">
-                    <Setter Property="Width" Value="3"/>
-                    <Setter Property="HorizontalAlignment" Value="Center"/>
-                    <Setter Property="VerticalAlignment" Value="Stretch"/>
-                </Trigger>
-                <Trigger Property="ResizeDirection" Value="Rows">
-                    <Setter Property="Height" Value="3"/>
-                    <Setter Property="VerticalAlignment" Value="Center"/>
-                    <Setter Property="HorizontalAlignment" Value="Stretch"/>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
-        <utils:StringFormatMultiValueConverter x:Key="StrFmtCvter"/>
-        <utils:BackgroundToForegroundConverter x:Key="Bg2FgCvter"/>
-    </Window.Resources>
-
     <Window.TaskbarItemInfo>
         <TaskbarItemInfo ProgressState="{Binding ProgressState}" ProgressValue="{Binding ProgressValue}"/>
     </Window.TaskbarItemInfo>
@@ -139,10 +117,6 @@
                                                   MouseLeftButtonUp="SpinesListView_MouseLeftButtonUp" 
                                                   DragEnter="SpinesListView_DragEnter" 
                                                   Drop="SpinesListView_Drop">
-                                            <ListView.ItemContainerStyle>
-                                                <Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource ListViewItemBaseStyle.Small}"/>
-                                            </ListView.ItemContainerStyle>
-
                                             <i:Interaction.Triggers>
                                                 <i:EventTrigger EventName="SelectionChanged">
                                                     <i:InvokeCommandAction Command="{Binding Cmd_ListViewSelectionChanged}"
@@ -254,207 +228,205 @@
                                             <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource ComboBoxBaseStyle}">
                                                 <Setter Property="HorizontalContentAlignment" Value="Right"/>
                                             </Style>
-                                            <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButton}">
+                                            <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButtonBaseStyle}">
                                                 <Setter Property="HorizontalAlignment" Value="Right"/>
                                             </Style>
                                         </TabControl.Resources>
 
                                         <!-- 基本属性页 -->
                                         <TabItem Header="{DynamicResource Str_BaseInfo}">
-                                            <StackPanel Grid.IsSharedSizeScope="True">
-                                                <!-- 名称 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_Name}"/>
-                                                    <TextBox Grid.Column="1" 
+                                            <ScrollViewer Style="{StaticResource MyVerticalScrollViewerBaseStyle}">
+                                                <StackPanel Grid.IsSharedSizeScope="True">
+                                                    <!-- 名称 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_Name}"/>
+                                                        <TextBox Grid.Column="1" 
                                                              Text="{Binding Name, Mode=OneWay}" 
                                                              IsReadOnly="True"
                                                              ToolTip="{Binding Text, RelativeSource={RelativeSource Mode=Self}}"/>
-                                                </Grid>
+                                                    </Grid>
 
-                                                <!-- 运行时版本 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_Version}"/>
-                                                    <TextBox Grid.Column="1" 
+                                                    <!-- 运行时版本 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_Version}"/>
+                                                        <TextBox Grid.Column="1" 
                                                              Text="{Binding Version, Mode=OneWay}" 
                                                              IsReadOnly="True" 
                                                              ToolTip="{Binding Text, RelativeSource={RelativeSource Mode=Self}}"/>
-                                                </Grid>
+                                                    </Grid>
 
-                                                <!-- 文件版本 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_FileVersion}"/>
-                                                    <TextBox Grid.Column="1" 
+                                                    <!-- 文件版本 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_FileVersion}"/>
+                                                        <TextBox Grid.Column="1" 
                                                              Text="{Binding FileVersion, Mode=OneWay}" 
                                                              IsReadOnly="True"
                                                              ToolTip="{Binding Text, RelativeSource={RelativeSource Mode=Self}}"/>
-                                                </Grid>
+                                                    </Grid>
 
-                                                <!-- 资源目录 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_AssetsDir}"/>
-                                                    <TextBox Grid.Column="1" 
+                                                    <!-- 资源目录 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_AssetsDir}"/>
+                                                        <TextBox Grid.Column="1" 
                                                              Text="{Binding AssetsDir, Mode=OneWay}" 
                                                              IsReadOnly="True"
                                                              ToolTip="{Binding Text, RelativeSource={RelativeSource Mode=Self}}"/>
-                                                </Grid>
+                                                    </Grid>
 
-                                                <!-- skel 文件路径 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_SkelPath}"/>
-                                                    <TextBox Grid.Column="1" 
+                                                    <!-- skel 文件路径 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_SkelPath}"/>
+                                                        <TextBox Grid.Column="1" 
                                                              Text="{Binding SkelPath, Mode=OneWay}" 
                                                              IsReadOnly="True"
                                                              ToolTip="{Binding Text, RelativeSource={RelativeSource Mode=Self}}"/>
-                                                </Grid>
+                                                    </Grid>
 
-                                                <!-- atlas 文件路径 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_AtlasPath}"/>
-                                                    <TextBox Grid.Column="1" 
+                                                    <!-- atlas 文件路径 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_AtlasPath}"/>
+                                                        <TextBox Grid.Column="1" 
                                                              Text="{Binding AtlasPath, Mode=OneWay}" 
                                                              IsReadOnly="True"
                                                              ToolTip="{Binding Text, RelativeSource={RelativeSource Mode=Self}}"/>
-                                                </Grid>
-                                            </StackPanel>
+                                                    </Grid>
+                                                </StackPanel>
+                                            </ScrollViewer>
                                         </TabItem>
 
                                         <!-- 渲染属性页 -->
                                         <TabItem Header="{DynamicResource Str_Render}">
-                                            <StackPanel Grid.IsSharedSizeScope="True">
-                                                <!-- 显示 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_IsShown}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding IsShown}"/>
-                                                </Grid>
+                                            <ScrollViewer Style="{StaticResource MyVerticalScrollViewerBaseStyle}">
+                                                <StackPanel Grid.IsSharedSizeScope="True">
+                                                    <!-- 显示 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_IsShown}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding IsShown}"/>
+                                                    </Grid>
 
-                                                <!-- 预乘通道 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_UsePma}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding UsePma}"/>
-                                                </Grid>
+                                                    <!-- 预乘通道 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_UsePma}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding UsePma}"/>
+                                                    </Grid>
 
-                                                <!-- 物理 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_Physics}"/>
-                                                    <ComboBox Grid.Column="1" 
+                                                    <!-- 物理 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_Physics}"/>
+                                                        <ComboBox Grid.Column="1" 
                                                               SelectedValue="{Binding Physics}" 
                                                               ItemsSource="{x:Static vm:SpineObjectTabViewModel.PhysicsOptions}"/>
-                                                </Grid>
+                                                    </Grid>
 
-                                                <!-- 时间因子 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_TimeScale}" ToolTip="{DynamicResource Str_TimeScaleTootltip}"/>
-                                                    <TextBox Grid.Column="1" Text="{Binding TimeScale}" ToolTip="{DynamicResource Str_TimeScaleTootltip}"/>
-                                                </Grid>
-                                            </StackPanel>
+                                                    <!-- 时间因子 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_TimeScale}" ToolTip="{DynamicResource Str_TimeScaleTootltip}"/>
+                                                        <TextBox Grid.Column="1" Text="{Binding TimeScale}" ToolTip="{DynamicResource Str_TimeScaleTootltip}"/>
+                                                    </Grid>
+                                                </StackPanel>
+                                            </ScrollViewer>
                                         </TabItem>
 
                                         <!-- 变换属性页 -->
                                         <TabItem Header="{DynamicResource Str_Transform}">
-                                            <StackPanel Grid.IsSharedSizeScope="True">
-                                                <!-- 缩放 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_Scale}"/>
-                                                    <TextBox Grid.Column="1" Text="{Binding Scale}"/>
-                                                </Grid>
+                                            <ScrollViewer Style="{StaticResource MyVerticalScrollViewerBaseStyle}">
+                                                <StackPanel Grid.IsSharedSizeScope="True">
+                                                    <!-- 缩放 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_Scale}"/>
+                                                        <TextBox Grid.Column="1" Text="{Binding Scale}"/>
+                                                    </Grid>
 
-                                                <!-- 水平翻转 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_FlipX}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding FlipX}"/>
-                                                </Grid>
+                                                    <!-- 水平翻转 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_FlipX}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding FlipX}"/>
+                                                    </Grid>
 
-                                                <!-- 垂直翻转 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_FlipY}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding FlipY}"/>
-                                                </Grid>
+                                                    <!-- 垂直翻转 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_FlipY}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding FlipY}"/>
+                                                    </Grid>
 
-                                                <!-- 横坐标 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_X}"/>
-                                                    <TextBox Grid.Column="1" Text="{Binding X}"/>
-                                                </Grid>
+                                                    <!-- 横坐标 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_X}"/>
+                                                        <TextBox Grid.Column="1" Text="{Binding X}"/>
+                                                    </Grid>
 
-                                                <!-- 纵坐标 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_Y}"/>
-                                                    <TextBox Grid.Column="1" Text="{Binding Y}"/>
-                                                </Grid>
-                                            </StackPanel>
+                                                    <!-- 纵坐标 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_Y}"/>
+                                                        <TextBox Grid.Column="1" Text="{Binding Y}"/>
+                                                    </Grid>
+                                                </StackPanel>
+                                            </ScrollViewer>
                                         </TabItem>
 
                                         <!-- 皮肤属性页 -->
                                         <TabItem Header="{DynamicResource Str_Skin}">
                                             <ListBox ItemsSource="{Binding Skins}">
-                                                <ListBox.ItemContainerStyle>
-                                                    <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource ListBoxItemBaseStyle}">
-                                                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                                                        <Setter Property="Padding" Value="0"/>
-                                                        <Setter Property="Margin" Value="0"/>
-                                                    </Style>
-                                                </ListBox.ItemContainerStyle>
-
                                                 <ListBox.ContextMenu>
                                                     <ContextMenu>
                                                         <MenuItem Header="{DynamicResource Str_EnableSkins}" 
@@ -486,14 +458,6 @@
                                         <!-- 插槽属性页 -->
                                         <TabItem Header="{DynamicResource Str_Slot}">
                                             <ListBox ItemsSource="{Binding Slots}" Grid.IsSharedSizeScope="True">
-                                                <ListBox.ItemContainerStyle>
-                                                    <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource ListBoxItemBaseStyle}">
-                                                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                                                        <Setter Property="Padding" Value="0"/>
-                                                        <Setter Property="Margin" Value="0"/>
-                                                    </Style>
-                                                </ListBox.ItemContainerStyle>
-
                                                 <ListBox.ContextMenu>
                                                     <ContextMenu>
                                                         <MenuItem Header="{DynamicResource Str_EnableSlots}" 
@@ -527,14 +491,6 @@
                                         <!-- 动画属性页 -->
                                         <TabItem Header="{DynamicResource Str_Animation}">
                                             <ListBox ItemsSource="{Binding AnimationTracks}" Grid.IsSharedSizeScope="True">
-                                                <ListBox.ItemContainerStyle>
-                                                    <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource ListBoxItemBaseStyle}">
-                                                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-                                                        <Setter Property="Padding" Value="0"/>
-                                                        <Setter Property="Margin" Value="0"/>
-                                                    </Style>
-                                                </ListBox.ItemContainerStyle>
-
                                                 <ListBox.ContextMenu>
                                                     <ContextMenu>
                                                         <MenuItem Header="{DynamicResource Str_AppendTrack}" 
@@ -594,80 +550,81 @@
 
                                         <!-- 调试属性页 -->
                                         <TabItem Header="{DynamicResource Str_Debug}">
-                                            <StackPanel Grid.IsSharedSizeScope="True">
-                                                <!-- 调试纹理 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_DebugTexture}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding DebugTexture}"/>
-                                                </Grid>
+                                            <ScrollViewer Style="{StaticResource MyVerticalScrollViewerBaseStyle}">
+                                                <StackPanel Grid.IsSharedSizeScope="True">
+                                                    <!-- 调试纹理 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_DebugTexture}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding DebugTexture}"/>
+                                                    </Grid>
 
-                                                <!-- 调试包围盒 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_DebugBounds}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding DebugBounds}"/>
-                                                </Grid>
+                                                    <!-- 调试包围盒 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_DebugBounds}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding DebugBounds}"/>
+                                                    </Grid>
 
-                                                <!-- 调试骨骼 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_DebugBones}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding DebugBones}"/>
-                                                </Grid>
+                                                    <!-- 调试骨骼 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_DebugBones}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding DebugBones}"/>
+                                                    </Grid>
 
-                                                <!-- 调试区域 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_DebugRegions}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding DebugRegions}"/>
-                                                </Grid>
+                                                    <!-- 调试区域 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_DebugRegions}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding DebugRegions}"/>
+                                                    </Grid>
 
-                                                <!-- 调试网格外壳 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_DebugMeshHulls}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding DebugMeshHulls}"/>
+                                                    <!-- 调试网格外壳 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_DebugMeshHulls}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding DebugMeshHulls}"/>
 
-                                                </Grid>
+                                                    </Grid>
 
-                                                <!-- 调试网格 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_DebugMeshes}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding DebugMeshes}"/>
-                                                </Grid>
+                                                    <!-- 调试网格 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_DebugMeshes}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding DebugMeshes}"/>
+                                                    </Grid>
 
-                                                <!-- 调试裁剪 -->
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
-                                                        <ColumnDefinition Width="*"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <Label Content="{DynamicResource Str_DebugClippings}"/>
-                                                    <ToggleButton Grid.Column="1" IsChecked="{Binding DebugClippings}"/>
-                                                </Grid>
+                                                    <!-- 调试裁剪 -->
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
+                                                            <ColumnDefinition Width="*"/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Label Content="{DynamicResource Str_DebugClippings}"/>
+                                                        <ToggleButton Grid.Column="1" IsChecked="{Binding DebugClippings}"/>
+                                                    </Grid>
 
-                                                <!-- 调试碰撞盒 -->
-                                                <!--<Grid>
+                                                    <!-- 调试碰撞盒 -->
+                                                    <!--<Grid>
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
                                                         <ColumnDefinition Width="*"/>
@@ -676,8 +633,8 @@
                                                     <ToggleButton Grid.Column="1" IsChecked="{Binding DebugBoundingBoxes}"/>
                                                 </Grid>-->
 
-                                                <!-- 调试路径 -->
-                                                <!--<Grid>
+                                                    <!-- 调试路径 -->
+                                                    <!--<Grid>
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
                                                         <ColumnDefinition Width="*"/>
@@ -686,8 +643,8 @@
                                                     <ToggleButton Grid.Column="1" IsChecked="{Binding DebugPaths}"/>
                                                 </Grid>-->
 
-                                                <!-- 调试点 -->
-                                                <!--<Grid>
+                                                    <!-- 调试点 -->
+                                                    <!--<Grid>
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="Auto" SharedSizeGroup="LabelCol"/>
                                                         <ColumnDefinition Width="*"/>
@@ -695,7 +652,8 @@
                                                     <Label Content="{DynamicResource Str_DebugPoints}"/>
                                                     <ToggleButton Grid.Column="1" IsChecked="{Binding DebugPoints}"/>
                                                 </Grid>-->
-                                            </StackPanel>
+                                                </StackPanel>
+                                            </ScrollViewer>
                                         </TabItem>
                                     </TabControl>
                                 </Grid>
@@ -825,11 +783,12 @@
                                     <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource ComboBoxBaseStyle}">
                                         <Setter Property="HorizontalContentAlignment" Value="Right"/>
                                     </Style>
-                                    <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButton}">
+                                    <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButtonBaseStyle}">
                                         <Setter Property="HorizontalAlignment" Value="Right"/>
                                     </Style>
                                 </TabItem.Resources>
-                                <StackPanel Grid.IsSharedSizeScope="True">
+                                <ScrollViewer Style="{StaticResource MyVerticalScrollViewerBaseStyle}">
+                                    <StackPanel Grid.IsSharedSizeScope="True">
                                     <!-- 水平分辨率 -->
                                     <Grid>
                                         <Grid.ColumnDefinitions>
@@ -991,6 +950,7 @@
                                         <ComboBox Grid.Column="1" SelectedValue="{Binding BackgroundImageMode}" ItemsSource="{x:Static vm:SFMLRendererViewModel.StretchOptions}"/>
                                     </Grid>
                                 </StackPanel>
+                                </ScrollViewer>
                             </TabItem>
                         </TabControl>
                     </Border>
@@ -1050,12 +1010,7 @@
 
                             <!-- 日志框容器 -->
                             <Border Grid.Row="2" Name="_loggerBoxContainer">
-                                <RichTextBox x:Name="_loggerRichTextBox" 
-                                             Grid.Row="2"
-                                             IsReadOnly="True"
-                                             FontFamily="Consolas" 
-                                             Block.LineHeight="3" 
-                                             VerticalScrollBarVisibility="Visible"/>
+                                <RichTextBox x:Name="_loggerRichTextBox" Grid.Row="2" Style="{StaticResource MyLogRichTextBoxStyle}"/>
                             </Border>
                         </Grid>
                     </Border>
diff --git a/SpineViewer/Views/PreferenceDialog.xaml b/SpineViewer/Views/PreferenceDialog.xaml
index 03a75c5..9384a2c 100644
--- a/SpineViewer/Views/PreferenceDialog.xaml
+++ b/SpineViewer/Views/PreferenceDialog.xaml
@@ -41,17 +41,16 @@
                 <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource ComboBoxBaseStyle}">
                     <Setter Property="HorizontalContentAlignment" Value="Right"/>
                 </Style>
-                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButton}">
+                <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource MyToggleButtonBaseStyle}">
                     <Setter Property="HorizontalAlignment" Value="Right"/>
                 </Style>
-                <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource GroupBoxTab}">
-                    <Setter Property="Background" Value="Transparent"/>
-                    <Setter Property="hc:TitleElement.Background" Value="Transparent"/>
+                <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource MyGroupBoxBaseStyle}">
                     <Setter Property="Margin" Value="0 5 0 10"/>
                 </Style>
             </Border.Resources>
-            <ScrollViewer  VerticalScrollBarVisibility="Auto">
-                <StackPanel Grid.IsSharedSizeScope="True" Margin="0 0 0 50">
+
+            <ScrollViewer Style="{StaticResource MyVerticalScrollViewerBaseStyle}">
+                <StackPanel Grid.IsSharedSizeScope="True">
                     <GroupBox Header="{DynamicResource Str_TextureLoadPreference}">
                         <StackPanel>
                             <Grid>