From 32c826a3db874428fd8b13c97ffe149afdbdec2e Mon Sep 17 00:00:00 2001
From: ww-rm <ww-rm@qq.com>
Date: Fri, 7 Nov 2025 23:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlabel=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8B=E5=88=92=E7=BA=BF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SpineViewer/Resources/Theme.xaml              | 40 +++++++++++++------
 SpineViewer/Views/AboutDialog.xaml            |  2 +-
 SpineViewer/Views/DiagnosticsDialog.xaml      |  2 +-
 .../CustomFFmpegExporterDialog.xaml           |  2 +-
 .../FFmpegVideoExporterDialog.xaml            |  2 +-
 .../ExporterDialogs/FrameExporterDialog.xaml  |  2 +-
 .../FrameSequenceExporterDialog.xaml          |  2 +-
 SpineViewer/Views/MainWindow.xaml             |  6 +--
 SpineViewer/Views/PreferenceDialog.xaml       |  2 +-
 9 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/SpineViewer/Resources/Theme.xaml b/SpineViewer/Resources/Theme.xaml
index fb363f5..c338f5a 100644
--- a/SpineViewer/Resources/Theme.xaml
+++ b/SpineViewer/Resources/Theme.xaml
@@ -11,7 +11,7 @@
     <utils:StringFormatMultiValueConverter x:Key="StrFmtCvter"/>
     <utils:BackgroundToForegroundConverter x:Key="Bg2FgCvter"/>
 
-    <Style x:Key="MyGridSplitterBaseStyle" TargetType="{x:Type GridSplitter}">
+    <Style x:Key="MyGridSplitterBaseStyle" TargetType="GridSplitter">
         <Setter Property="Background" Value="{DynamicResource SecondaryBorderBrush}"/>
         <Setter Property="ShowsPreview" Value="False"/>
         <Style.Triggers>
@@ -28,17 +28,17 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="MyToggleButtonBaseStyle" TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource ToggleButtonSwitch}">
+    <Style x:Key="MyToggleButtonBaseStyle" TargetType="ToggleButton" BasedOn="{StaticResource ToggleButtonSwitch}">
         <Setter Property="hc:VisualElement.HighlightBrush" Value="{DynamicResource DarkSuccessBrush}"/>
     </Style>
 
-    <Style x:Key="MyListBoxBaseStyle" TargetType="{x:Type ListBox}" BasedOn="{StaticResource ListBoxBaseStyle}">
+    <Style x:Key="MyListBoxBaseStyle" TargetType="ListBox" BasedOn="{StaticResource ListBoxBaseStyle}">
         <Setter Property="SelectionMode" Value="Extended"/>
         <!--<Setter Property="VirtualizingPanel.IsVirtualizing" Value="False"/>-->
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Visible"/>
         <Setter Property="ItemContainerStyle">
             <Setter.Value>
-                <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource ListBoxItemBaseStyle}">
+                <Style TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItemBaseStyle}">
                     <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
                     <Setter Property="Padding" Value="0"/>
                     <Setter Property="Margin" Value="0"/>
@@ -47,26 +47,26 @@
         </Setter>
     </Style>
 
-    <Style x:Key="MyListViewBaseStyle" TargetType="{x:Type ListView}" BasedOn="{StaticResource ListViewBaseStyle}">
+    <Style x:Key="MyListViewBaseStyle" TargetType="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}">
+    <Style x:Key="MyGroupBoxBaseStyle" TargetType="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}">
+    <Style x:Key="MyLogRichTextBoxStyle" TargetType="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}">
+    <Style x:Key="MyVerticalScrollViewerBaseStyle" TargetType="ScrollViewer" BasedOn="{StaticResource ScrollViewerNativeBaseStyle}">
         <Setter Property="Padding" Value="0"/>
         <Setter Property="VerticalScrollBarVisibility" Value="Auto"/>
         <Style.Triggers>
@@ -99,10 +99,24 @@
         </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 ListView}" BasedOn="{StaticResource MyListViewBaseStyle}"/>
-    <Style TargetType="{x:Type GroupBox}" BasedOn="{StaticResource MyGroupBoxBaseStyle}"/>
+    <Style x:Key="MyLabelStyle" TargetType="Label" BasedOn="{StaticResource LabelDefault}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Label">
+                    <Border CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius),RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                        <!-- 直接复制的原本 LabelDefault 的样式, 但是去除了 RecognizesAccessKey 防止不显示第一个下划线 -->
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="False" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="GridSplitter" BasedOn="{StaticResource MyGridSplitterBaseStyle}"/>
+    <Style TargetType="ToggleButton" BasedOn="{StaticResource MyToggleButtonBaseStyle}"/>
+    <Style TargetType="ListBox" BasedOn="{StaticResource MyListBoxBaseStyle}"/>
+    <Style TargetType="ListView" BasedOn="{StaticResource MyListViewBaseStyle}"/>
+    <Style TargetType="GroupBox" BasedOn="{StaticResource MyGroupBoxBaseStyle}"/>
+    <Style TargetType="Label" BasedOn="{StaticResource MyLabelStyle}"/>
 
 </ResourceDictionary>
diff --git a/SpineViewer/Views/AboutDialog.xaml b/SpineViewer/Views/AboutDialog.xaml
index d11fcd2..c9a6255 100644
--- a/SpineViewer/Views/AboutDialog.xaml
+++ b/SpineViewer/Views/AboutDialog.xaml
@@ -19,7 +19,7 @@
 
     <Grid Margin="30">
         <Grid.Resources>
-            <Style TargetType="{x:Type Label}" BasedOn="{StaticResource LabelDefault}">
+            <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MyLabelStyle}">
                 <Setter Property="HorizontalAlignment" Value="Stretch"/>
                 <Setter Property="HorizontalContentAlignment" Value="Left"/>
             </Style>
diff --git a/SpineViewer/Views/DiagnosticsDialog.xaml b/SpineViewer/Views/DiagnosticsDialog.xaml
index ea046ad..ba58e9b 100644
--- a/SpineViewer/Views/DiagnosticsDialog.xaml
+++ b/SpineViewer/Views/DiagnosticsDialog.xaml
@@ -24,7 +24,7 @@
 
         <Border>
             <Border.Resources>
-                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource LabelDefault}">
+                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MyLabelStyle}">
                     <Setter Property="HorizontalAlignment" Value="Stretch"/>
                     <Setter Property="HorizontalContentAlignment" Value="Left"/>
                 </Style>
diff --git a/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
index 4f2867c..53b2b65 100644
--- a/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
@@ -31,7 +31,7 @@
 
         <Border>
             <Border.Resources>
-                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource LabelDefault}">
+                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MyLabelStyle}">
                     <Setter Property="HorizontalAlignment" Value="Stretch"/>
                     <Setter Property="HorizontalContentAlignment" Value="Right"/>
                 </Style>
diff --git a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
index 91e3efa..25fbda1 100644
--- a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
@@ -31,7 +31,7 @@
 
         <Border>
             <Border.Resources>
-                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource LabelDefault}">
+                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MyLabelStyle}">
                     <Setter Property="HorizontalAlignment" Value="Stretch"/>
                     <Setter Property="HorizontalContentAlignment" Value="Right"/>
                 </Style>
diff --git a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
index 2da3a98..f309a2a 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
@@ -31,7 +31,7 @@
 
         <Border>
             <Border.Resources>
-                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource LabelDefault}">
+                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MyLabelStyle}">
                     <Setter Property="HorizontalAlignment" Value="Stretch"/>
                     <Setter Property="HorizontalContentAlignment" Value="Right"/>
                 </Style>
diff --git a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
index 6688872..73bbb27 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
@@ -31,7 +31,7 @@
 
         <Border>
             <Border.Resources>
-                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource LabelDefault}">
+                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MyLabelStyle}">
                     <Setter Property="HorizontalAlignment" Value="Stretch"/>
                     <Setter Property="HorizontalContentAlignment" Value="Right"/>
                 </Style>
diff --git a/SpineViewer/Views/MainWindow.xaml b/SpineViewer/Views/MainWindow.xaml
index 06f20bf..6f323d7 100644
--- a/SpineViewer/Views/MainWindow.xaml
+++ b/SpineViewer/Views/MainWindow.xaml
@@ -239,7 +239,7 @@
                                                 TabStripPlacement="Bottom"
                                                 DataContext="{Binding SpineObjectTabViewModel}">
                                         <TabControl.Resources>
-                                            <Style TargetType="{x:Type Label}" BasedOn="{StaticResource LabelDefault}">
+                                            <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MyLabelStyle}">
                                                 <Setter Property="HorizontalAlignment" Value="Stretch"/>
                                                 <Setter Property="HorizontalContentAlignment" Value="Right"/>
                                             </Style>
@@ -695,7 +695,7 @@
                                     </Border>
                                 </TabItem.Header>
                                 <TabItem.Resources>
-                                    <Style TargetType="{x:Type Label}" BasedOn="{StaticResource LabelDefault}">
+                                    <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MyLabelStyle}">
                                         <Setter Property="HorizontalAlignment" Value="Stretch"/>
                                         <Setter Property="HorizontalContentAlignment" Value="Right"/>
                                     </Style>
@@ -955,7 +955,7 @@
 
                                     <Grid Grid.Row="2" DataContext="{Binding SelectedItem}">
                                         <Grid.Resources>
-                                            <Style TargetType="{x:Type Label}" BasedOn="{StaticResource LabelDefault}">
+                                            <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MyLabelStyle}">
                                                 <Setter Property="HorizontalAlignment" Value="Stretch"/>
                                                 <Setter Property="HorizontalContentAlignment" Value="Right"/>
                                             </Style>
diff --git a/SpineViewer/Views/PreferenceDialog.xaml b/SpineViewer/Views/PreferenceDialog.xaml
index 9384a2c..f962604 100644
--- a/SpineViewer/Views/PreferenceDialog.xaml
+++ b/SpineViewer/Views/PreferenceDialog.xaml
@@ -31,7 +31,7 @@
 
         <Border>
             <Border.Resources>
-                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource LabelDefault}">
+                <Style TargetType="{x:Type Label}" BasedOn="{StaticResource MyLabelStyle}">
                     <Setter Property="HorizontalAlignment" Value="Stretch"/>
                     <Setter Property="HorizontalContentAlignment" Value="Right"/>
                 </Style>