From 24dec0e4cf6d76e5e16bcb466025aa6b86ba45e8 Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Sat, 11 Feb 2023 16:42:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=AE=80=E5=8C=96TextBlock?=
 =?UTF-8?q?=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/App.xaml                        |  2 ++
 src/MaaWpfGui/Views/CopilotView.xaml          | 12 ++---------
 src/MaaWpfGui/Views/DepotView.xaml            |  1 -
 src/MaaWpfGui/Views/RecruitView.xaml          |  1 -
 src/MaaWpfGui/Views/SettingsView.xaml         | 13 ------------
 src/MaaWpfGui/Views/TaskQueueView.xaml        | 10 +++------
 .../Views/UserControl/AboutUserControl.xaml   | 21 +++++++------------
 .../AutoRecruitSettingsUserControl.xaml       |  1 -
 .../ConnectSettingsUserControl.xaml           |  4 ----
 .../UserControl/FightSettingsUserControl.xaml |  6 ------
 .../UserControl/GUISettingsUserControl.xaml   |  2 --
 .../UserControl/GameClientUserControl.xaml    |  1 -
 .../HotKeySettingsUserControl.xaml            |  2 --
 .../InfrastSettingsUserControl.xaml           | 10 +++------
 .../UserControl/MallSettingsUserControl.xaml  |  2 --
 .../OtherCombatSettingsUserControl.xaml       |  1 -
 .../RoguelikeSettingsUserControl.xaml         | 11 +---------
 .../UserControl/StartSettingsUserControl.xaml |  7 +------
 .../UserControl/TimerSettingsUserControl.xaml | 16 +++++++-------
 .../VersionUpdateSettingsUserControl.xaml     |  3 ---
 src/MaaWpfGui/Views/VersionUpdateView.xaml    |  2 +-
 21 files changed, 28 insertions(+), 100 deletions(-)

diff --git a/src/MaaWpfGui/App.xaml b/src/MaaWpfGui/App.xaml
index fc03f429f2..2112adc969 100644
--- a/src/MaaWpfGui/App.xaml
+++ b/src/MaaWpfGui/App.xaml
@@ -26,6 +26,8 @@
                 <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml" />
             </ResourceDictionary.MergedDictionaries>
+            <!--  A Style that affects all TextBlocks  -->
+            <Style BasedOn="{StaticResource TextBlockDefault}" TargetType="TextBlock" />
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/src/MaaWpfGui/Views/CopilotView.xaml b/src/MaaWpfGui/Views/CopilotView.xaml
index 4bbeb1a56d..69022ebc0a 100644
--- a/src/MaaWpfGui/Views/CopilotView.xaml
+++ b/src/MaaWpfGui/Views/CopilotView.xaml
@@ -31,7 +31,6 @@
             <TextBlock
                 Margin="10"
                 Block.TextAlignment="Center"
-                Style="{StaticResource TextBlockDefault}"
                 Text="{DynamicResource CopilotLocation}" />
             <TextBox
                 Width="300"
@@ -87,18 +86,12 @@
                     Content="{DynamicResource Stop}"
                     Visibility="{c:Binding !Idle}" />
             </Grid>
-            <TextBlock
-                Margin="5"
-                Block.TextAlignment="Center"
-                Style="{StaticResource TextBlockDefault}">
+            <TextBlock Margin="5" Block.TextAlignment="Center">
                 <Hyperlink Command="{s:Action Hyperlink_Click}" CommandParameter="{Binding Url}">
                     <TextBlock Text="{Binding Url}" />
                 </Hyperlink>
             </TextBlock>
-            <TextBlock
-                Margin="5"
-                Block.TextAlignment="Center"
-                Style="{StaticResource TextBlockDefault}">
+            <TextBlock Margin="5" Block.TextAlignment="Center">
                 <Hyperlink Command="{s:Action Hyperlink_Click2}">
                     <TextBlock Text="{DynamicResource MapPrts}" />
                 </Hyperlink>
@@ -121,7 +114,6 @@
                                 Margin="5"
                                 FontWeight="{Binding Weight}"
                                 Foreground="{Binding Color}"
-                                Style="{StaticResource TextBlockDefault}"
                                 Text="{Binding Content}"
                                 TextWrapping="Wrap" />
                         </StackPanel>
diff --git a/src/MaaWpfGui/Views/DepotView.xaml b/src/MaaWpfGui/Views/DepotView.xaml
index 62af4d16b5..f82882d594 100644
--- a/src/MaaWpfGui/Views/DepotView.xaml
+++ b/src/MaaWpfGui/Views/DepotView.xaml
@@ -33,7 +33,6 @@
                     Margin="10"
                     HorizontalAlignment="Left"
                     FontSize="14"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding DepotResult}"
                     TextWrapping="Wrap" />
             </StackPanel>
diff --git a/src/MaaWpfGui/Views/RecruitView.xaml b/src/MaaWpfGui/Views/RecruitView.xaml
index d561d7aa40..f5ee7e61c4 100644
--- a/src/MaaWpfGui/Views/RecruitView.xaml
+++ b/src/MaaWpfGui/Views/RecruitView.xaml
@@ -33,7 +33,6 @@
                     Margin="10"
                     HorizontalAlignment="Left"
                     FontSize="14"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding RecruitResult}"
                     TextWrapping="Wrap" />
             </StackPanel>
diff --git a/src/MaaWpfGui/Views/SettingsView.xaml b/src/MaaWpfGui/Views/SettingsView.xaml
index 88f404b177..09c98419f3 100644
--- a/src/MaaWpfGui/Views/SettingsView.xaml
+++ b/src/MaaWpfGui/Views/SettingsView.xaml
@@ -43,7 +43,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[0]}" />
                 <local:GameClientUserControl
                     Margin="20"
@@ -58,7 +57,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[1]}" />
                 <local:InfrastSettingsUserControl
                     Margin="20"
@@ -73,7 +71,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[2]}" />
                 <local:RoguelikeSettingsUserControl
                     Margin="20"
@@ -88,7 +85,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[3]}" />
                 <local:AutoRecruitSettingsUserControl
                     Margin="20"
@@ -103,7 +99,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[4]}" />
                 <local:MallSettingsUserControl
                     Margin="20"
@@ -118,7 +113,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[5]}" />
                 <local:OtherCombatSettingsUserControl
                     Margin="20"
@@ -133,7 +127,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[6]}" />
                 <local:ConnectSettingsUserControl
                     Margin="20"
@@ -148,7 +141,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[7]}" />
                 <local:StartSettingsUserControl Margin="20" HorizontalAlignment="Center" />
                 <Rectangle
@@ -160,7 +152,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[8]}" />
                 <local:TimerSettingsUserControl Margin="20" HorizontalAlignment="Center" />
                 <Rectangle
@@ -172,7 +163,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[9]}" />
                 <local:GUISettingsUserControl Margin="20" HorizontalAlignment="Center" />
                 <Rectangle
@@ -184,7 +174,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[10]}" />
                 <local:HotKeySettingsUserControl Margin="20" HorizontalAlignment="Center" />
                 <Rectangle
@@ -196,7 +185,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[11]}" />
                 <local:VersionUpdateSettingsUserControl Margin="20" HorizontalAlignment="Center" />
                 <Rectangle
@@ -208,7 +196,6 @@
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     Foreground="Gray"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding ListTitle[12]}" />
                 <local:AboutUserControl Margin="20" HorizontalAlignment="Center" />
                 <!--<Rectangle HorizontalAlignment="Stretch" Fill="LightGray" Height="1" />-->
diff --git a/src/MaaWpfGui/Views/TaskQueueView.xaml b/src/MaaWpfGui/Views/TaskQueueView.xaml
index c55827a6da..37080a58e3 100644
--- a/src/MaaWpfGui/Views/TaskQueueView.xaml
+++ b/src/MaaWpfGui/Views/TaskQueueView.xaml
@@ -58,8 +58,8 @@
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
-                                    <!--<TextBlock Style="{StaticResource TextBlockDefault}" Text="{Binding ID}" />
-                            <TextBlock Style="{StaticResource TextBlockDefault}" Text=". " />-->
+                                    <!--<TextBlock  Text="{Binding ID}" />
+                            <TextBlock  Text=". " />-->
                                     <CheckBox
                                         Content="{Binding Name}"
                                         IsChecked="{Binding IsChecked}"
@@ -120,16 +120,15 @@
                     Padding="5,0"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource Then}"
                     TextWrapping="Wrap" />
                 <ComboBox
                     Grid.Column="1"
                     Width="160"
                     Margin="5"
-                    MaxDropDownHeight="800"
                     DisplayMemberPath="Display"
                     ItemsSource="{Binding ActionAfterCompletedList}"
+                    MaxDropDownHeight="800"
                     SelectedValue="{Binding ActionAfterCompleted}"
                     SelectedValuePath="Value" />
             </Grid>
@@ -176,7 +175,6 @@
                 Grid.Row="1"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Bottom"
-                Style="{StaticResource TextBlockDefault}"
                 Text="{Binding StagesOfToday}" />
         </Grid>
 
@@ -201,7 +199,6 @@
                                 Margin="0,5"
                                 VerticalAlignment="Top"
                                 Foreground="Gray"
-                                Style="{StaticResource TextBlockDefault}"
                                 Text="{Binding Time}"
                                 TextWrapping="Wrap" />
                             <TextBlock
@@ -210,7 +207,6 @@
                                 VerticalAlignment="Top"
                                 FontWeight="{Binding Weight}"
                                 Foreground="{Binding Color}"
-                                Style="{StaticResource TextBlockDefault}"
                                 Text="{Binding Content}"
                                 TextWrapping="Wrap" />
                         </StackPanel>
diff --git a/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml b/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml
index efec634a48..2e577118a9 100644
--- a/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/AboutUserControl.xaml
@@ -15,8 +15,7 @@
         <TextBlock
             Margin="5"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}">
+            VerticalAlignment="Center">
             <Hyperlink
                 Click="Hyperlink_Click"
                 Cursor="Hand"
@@ -29,8 +28,7 @@
         <TextBlock
             Margin="5"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}">
+            VerticalAlignment="Center">
             <Hyperlink
                 Click="Hyperlink_Click"
                 NavigateUri="{Binding Source={x:Static local:MaaUrls.GitHub}}"
@@ -42,8 +40,7 @@
         <TextBlock
             Margin="5"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}">
+            VerticalAlignment="Center">
             <Hyperlink
                 Click="Hyperlink_Click"
                 Cursor="Hand"
@@ -56,8 +53,7 @@
         <TextBlock
             Margin="5"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}">
+            VerticalAlignment="Center">
             <Hyperlink
                 Click="Hyperlink_Click"
                 NavigateUri="{Binding Source={x:Static local:MaaUrls.QQchannel}}"
@@ -69,8 +65,7 @@
         <TextBlock
             Margin="5"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}">
+            VerticalAlignment="Center">
             <Hyperlink
                 Click="Hyperlink_Click"
                 NavigateUri="{Binding Source={x:Static local:MaaUrls.Telegram}}"
@@ -82,8 +77,7 @@
         <TextBlock
             Margin="5"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}">
+            VerticalAlignment="Center">
             <Hyperlink
                 Click="Hyperlink_Click"
                 NavigateUri="{Binding Source={x:Static local:MaaUrls.HelpUri}}"
@@ -95,8 +89,7 @@
         <TextBlock
             Margin="5"
             HorizontalAlignment="Center"
-            VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}">
+            VerticalAlignment="Center">
             <Hyperlink
                 Click="Hyperlink_Click"
                 NavigateUri="{Binding Source={x:Static local:MaaUrls.GitHubIssues}}"
diff --git a/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml
index f5277f5b92..710357a536 100644
--- a/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/AutoRecruitSettingsUserControl.xaml
@@ -55,7 +55,6 @@
                     Margin="5"
                     VerticalAlignment="Center"
                     Block.TextAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource RecruitMaxTimes}"
                     TextWrapping="Wrap" />
                 <TextBox
diff --git a/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
index fe70e5f378..fe3a6c850b 100644
--- a/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/ConnectSettingsUserControl.xaml
@@ -53,7 +53,6 @@
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
-            Style="{StaticResource TextBlockDefault}"
             Text="{DynamicResource ADBPath}"
             TextWrapping="Wrap" />
         <TextBox
@@ -80,7 +79,6 @@
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
-            Style="{StaticResource TextBlockDefault}"
             Text="{DynamicResource ConnectionAddress}"
             TextWrapping="Wrap" />
         <ComboBox
@@ -100,7 +98,6 @@
             Grid.Column="0"
             Margin="10"
             Block.TextAlignment="Center"
-            Style="{StaticResource TextBlockDefault}"
             Text="{DynamicResource ConnectionPreset}"
             TextWrapping="Wrap" />
         <ComboBox
@@ -128,7 +125,6 @@
             Grid.Row="5"
             Grid.Column="0"
             VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}"
             Text="{DynamicResource TouchMode}" />
         <ComboBox
             Grid.Row="5"
diff --git a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
index ff0cca4b72..c6519ad4a9 100644
--- a/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/FightSettingsUserControl.xaml
@@ -97,7 +97,6 @@
                         <TextBlock
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Style="{StaticResource TextBlockDefault}"
                             Text="{DynamicResource Quantity}"
                             TextAlignment="Center" />
                     </Grid>
@@ -141,7 +140,6 @@
                             Margin="10,6"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Style="{StaticResource TextBlockDefault}"
                             Text="{DynamicResource StageSelect}"
                             TextAlignment="Center"
                             TextWrapping="Wrap" />
@@ -151,7 +149,6 @@
                             Margin="10,6"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Style="{StaticResource TextBlockDefault}"
                             Text="{DynamicResource StageSelect2}"
                             TextAlignment="Center"
                             TextWrapping="Wrap" />
@@ -162,7 +159,6 @@
                             Margin="10,6"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Style="{StaticResource TextBlockDefault}"
                             Text=""
                             TextAlignment="Center"
                             TextWrapping="Wrap" />
@@ -172,7 +168,6 @@
                             Margin="10,6"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Style="{StaticResource TextBlockDefault}"
                             Text="{DynamicResource RemainingSanityStage}"
                             TextAlignment="Center"
                             TextWrapping="Wrap" />
@@ -257,7 +252,6 @@
                             Margin="10,6"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Style="{StaticResource TextBlockDefault}"
                             Text="{DynamicResource CustomInfrastPlan}"
                             TextAlignment="Center"
                             TextWrapping="Wrap"
diff --git a/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml
index 47546fd738..52373d063d 100644
--- a/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/GUISettingsUserControl.xaml
@@ -36,7 +36,6 @@
             <TextBlock
                 Margin="10"
                 Block.TextAlignment="Center"
-                Style="{StaticResource TextBlockDefault}"
                 Text="{DynamicResource MainViewButtonFeature}" />
             <ComboBox
                 Width="85"
@@ -54,7 +53,6 @@
             <TextBlock
                 Margin="10"
                 Block.TextAlignment="Center"
-                Style="{StaticResource TextBlockDefault}"
                 Text="{DynamicResource Language}" />
             <ComboBox
                 x:Name="LanguageSelector"
diff --git a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
index b10daa8675..24a41ef978 100644
--- a/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/GameClientUserControl.xaml
@@ -19,7 +19,6 @@
             Margin="10,0"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
-            Style="{StaticResource TextBlockDefault}"
             Text="{DynamicResource ClientType}" />
         <ComboBox
             Width="200"
diff --git a/src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml
index 99975dcbff..d78ca0a541 100644
--- a/src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml
@@ -23,7 +23,6 @@
             <TextBlock
                 Margin="10"
                 Block.TextAlignment="Center"
-                Style="{StaticResource TextBlockDefault}"
                 Text="{DynamicResource HotKeyShowGui}" />
             <local:HotKeyEditorUserControl
                 Margin="10"
@@ -37,7 +36,6 @@
             <TextBlock
                 Margin="10"
                 Block.TextAlignment="Center"
-                Style="{StaticResource TextBlockDefault}"
                 Text="{DynamicResource HotKeyLinkStart}" />
             <local:HotKeyEditorUserControl
                 Margin="10"
diff --git a/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml
index 59e1ebfd53..53007899e3 100644
--- a/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/InfrastSettingsUserControl.xaml
@@ -34,8 +34,8 @@
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
-                            <!--<TextBlock Style="{StaticResource TextBlockDefault}" Text="{Binding ID}" />
-                            <TextBlock Style="{StaticResource TextBlockDefault}" Text=". " />-->
+                            <!--<TextBlock  Text="{Binding ID}" />
+                            <TextBlock  Text=". " />-->
                             <CheckBox Content="{Binding Name}" IsChecked="{Binding IsChecked}" />
                         </StackPanel>
                     </DataTemplate>
@@ -56,7 +56,6 @@
                         Margin="0,5"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Style="{StaticResource TextBlockDefault}"
                         Text="{DynamicResource DroneUsage}" />
                     <ComboBox
                         Width="150"
@@ -75,7 +74,6 @@
                         Margin="0,5"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Style="{StaticResource TextBlockDefault}"
                         Text="{Binding DormThresholdLabel}"
                         ToolTip="{DynamicResource InfrastThresholdTip}" />
                     <Slider
@@ -151,7 +149,6 @@
                     Grid.Row="0"
                     Grid.Column="0"
                     HorizontalAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource DefaultInfrast}" />
                 <ComboBox
                     Grid.Row="1"
@@ -166,8 +163,7 @@
                     Grid.Column="1"
                     Margin="5"
                     HorizontalAlignment="Center"
-                    VerticalAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}">
+                    VerticalAlignment="Center">
                     <Hyperlink
                         Click="Hyperlink_Click"
                         NavigateUri="{Binding Source={x:Static local:MaaUrls.CustomInfrastGenerator}}"
diff --git a/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
index 03c6c42cda..3edfe3d63d 100644
--- a/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/MallSettingsUserControl.xaml
@@ -55,7 +55,6 @@
                 <TextBlock
                     Margin="10"
                     Block.TextAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource Blacklist}" />
                 <TextBox
                     Width="250"
@@ -71,7 +70,6 @@
                 <TextBlock
                     Margin="10"
                     Block.TextAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource HighPriority}" />
                 <TextBox
                     Width="250"
diff --git a/src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml
index 2483ddcc21..f0fad0d1e4 100644
--- a/src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/OtherCombatSettingsUserControl.xaml
@@ -69,7 +69,6 @@
             <TextBlock
                 Margin="10"
                 Block.TextAlignment="Center"
-                Style="{StaticResource TextBlockDefault}"
                 Text="{DynamicResource PenguinID}" />
             <TextBox
                 Width="150"
diff --git a/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
index c3ac8da013..4ea64171e1 100644
--- a/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/RoguelikeSettingsUserControl.xaml
@@ -21,10 +21,7 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Top"
                 Orientation="Horizontal">
-                <TextBlock
-                    Margin="10"
-                    Style="{StaticResource TextBlockDefault}"
-                    Text="{DynamicResource RoguelikeTheme}" />
+                <TextBlock Margin="10" Text="{DynamicResource RoguelikeTheme}" />
                 <ComboBox
                     Width="110"
                     IsHitTestVisible="{Binding Idle}"
@@ -40,7 +37,6 @@
                 <TextBlock
                     Margin="10"
                     VerticalAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource Strategy}" />
                 <ComboBox
                     Width="300"
@@ -57,7 +53,6 @@
                     <TextBlock
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
-                        Style="{StaticResource TextBlockDefault}"
                         Text="{DynamicResource StartTimesLimit}"
                         TextWrapping="Wrap" />
                     <hc:TextBox
@@ -79,7 +74,6 @@
                 <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                     <TextBlock
                         VerticalAlignment="Center"
-                        Style="{StaticResource TextBlockDefault}"
                         Text="{DynamicResource GoldTimesLimit}"
                         TextWrapping="Wrap" />
                     <hc:TextBox
@@ -113,7 +107,6 @@
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
                     Block.TextAlignment="Right"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource StartingSquad}" />
                 <ComboBox
                     Width="300"
@@ -133,7 +126,6 @@
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
                     Block.TextAlignment="Right"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource StartingRoles}" />
                 <ComboBox
                     Width="300"
@@ -153,7 +145,6 @@
                     HorizontalAlignment="Right"
                     VerticalAlignment="Center"
                     Block.TextAlignment="Right"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource StartingCoreChar}"
                     TextWrapping="Wrap" />
                 <hc:TextBox
diff --git a/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml
index 08eacfd9c2..a7b4ffe901 100644
--- a/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/StartSettingsUserControl.xaml
@@ -63,7 +63,6 @@
                     <TextBlock
                         VerticalAlignment="Center"
                         Block.TextAlignment="Center"
-                        Style="{StaticResource TextBlockDefault}"
                         Text="{DynamicResource EmulatorPath}" />
                     <Button
                         Margin="10,0,0,0"
@@ -77,10 +76,7 @@
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
                     Orientation="Horizontal">
-                    <TextBlock
-                        Block.TextAlignment="Center"
-                        Style="{StaticResource TextBlockDefault}"
-                        Text="{DynamicResource AdditionCommand}" />
+                    <TextBlock Block.TextAlignment="Center" Text="{DynamicResource AdditionCommand}" />
                 </StackPanel>
                 <TextBox Margin="20,5" Text="{Binding EmulatorAddCommand}" />
             </StackPanel>
@@ -92,7 +88,6 @@
                 <TextBlock
                     Margin="3"
                     Block.TextAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{DynamicResource WaitForEmulator}" />
                 <TextBox
                     Width="50"
diff --git a/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml
index 02fa60db90..8fd9e85435 100644
--- a/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TimerSettingsUserControl.xaml
@@ -49,7 +49,7 @@
                     IsReadOnly="{c:Binding !TimerModels.Timers[0].IsOn}"
                     Text="{Binding TimerModels.Timers[0].Hour, StringFormat=D2}"
                     TextWrapping="Wrap" />
-                <TextBlock Style="{StaticResource TextBlockDefault}" Text=":" />
+                <TextBlock Text=":" />
                 <TextBox
                     Width="35"
                     Margin="10"
@@ -85,7 +85,7 @@
                     IsReadOnly="{c:Binding !TimerModels.Timers[1].IsOn}"
                     Text="{Binding TimerModels.Timers[1].Hour, StringFormat=D2}"
                     TextWrapping="Wrap" />
-                <TextBlock Style="{StaticResource TextBlockDefault}" Text=":" />
+                <TextBlock Text=":" />
                 <TextBox
                     Width="35"
                     Margin="10"
@@ -121,7 +121,7 @@
                     IsReadOnly="{c:Binding !TimerModels.Timers[2].IsOn}"
                     Text="{Binding TimerModels.Timers[2].Hour, StringFormat=D2}"
                     TextWrapping="Wrap" />
-                <TextBlock Style="{StaticResource TextBlockDefault}" Text=":" />
+                <TextBlock Text=":" />
                 <TextBox
                     Width="35"
                     Margin="10"
@@ -157,7 +157,7 @@
                     IsReadOnly="{c:Binding !TimerModels.Timers[3].IsOn}"
                     Text="{Binding TimerModels.Timers[3].Hour, StringFormat=D2}"
                     TextWrapping="Wrap" />
-                <TextBlock Style="{StaticResource TextBlockDefault}" Text=":" />
+                <TextBlock Text=":" />
                 <TextBox
                     Width="35"
                     Margin="10"
@@ -193,7 +193,7 @@
                     IsReadOnly="{c:Binding !TimerModels.Timers[4].IsOn}"
                     Text="{Binding TimerModels.Timers[4].Hour, StringFormat=D2}"
                     TextWrapping="Wrap" />
-                <TextBlock Style="{StaticResource TextBlockDefault}" Text=":" />
+                <TextBlock Text=":" />
                 <TextBox
                     Width="35"
                     Margin="10"
@@ -229,7 +229,7 @@
                     IsReadOnly="{c:Binding !TimerModels.Timers[5].IsOn}"
                     Text="{Binding TimerModels.Timers[5].Hour, StringFormat=D2}"
                     TextWrapping="Wrap" />
-                <TextBlock Style="{StaticResource TextBlockDefault}" Text=":" />
+                <TextBlock Text=":" />
                 <TextBox
                     Width="35"
                     Margin="10"
@@ -265,7 +265,7 @@
                     IsReadOnly="{c:Binding !TimerModels.Timers[6].IsOn}"
                     Text="{Binding TimerModels.Timers[6].Hour, StringFormat=D2}"
                     TextWrapping="Wrap" />
-                <TextBlock Style="{StaticResource TextBlockDefault}" Text=":" />
+                <TextBlock Text=":" />
                 <TextBox
                     Width="35"
                     Margin="10"
@@ -301,7 +301,7 @@
                     IsReadOnly="{c:Binding !TimerModels.Timers[7].IsOn}"
                     Text="{Binding TimerModels.Timers[7].Hour, StringFormat=D2}"
                     TextWrapping="Wrap" />
-                <TextBlock Style="{StaticResource TextBlockDefault}" Text=":" />
+                <TextBlock Text=":" />
                 <TextBox
                     Width="35"
                     Margin="10"
diff --git a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
index ab2d81f8d4..cdb2b21b98 100644
--- a/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/VersionUpdateSettingsUserControl.xaml
@@ -48,7 +48,6 @@
                     <TextBlock
                         Margin="10,10,0,10"
                         Block.TextAlignment="Center"
-                        Style="{StaticResource TextBlockDefault}"
                         Text="{DynamicResource UpdateCheck}" />
                     <ComboBox
                         Width="120"
@@ -78,7 +77,6 @@
                     Grid.Row="0"
                     Margin="1"
                     VerticalAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="Http Proxy" />
                 <TextBox
                     Grid.Row="1"
@@ -92,7 +90,6 @@
                     Margin="10"
                     HorizontalAlignment="Center"
                     VerticalAlignment="Center"
-                    Style="{StaticResource TextBlockDefault}"
                     Text="{Binding VersionInfo, Mode=OneWay}" />
                 <Button
                     Grid.Row="3"
diff --git a/src/MaaWpfGui/Views/VersionUpdateView.xaml b/src/MaaWpfGui/Views/VersionUpdateView.xaml
index 930ceb2393..b40b2bcdd7 100644
--- a/src/MaaWpfGui/Views/VersionUpdateView.xaml
+++ b/src/MaaWpfGui/Views/VersionUpdateView.xaml
@@ -41,9 +41,9 @@
         <mdxam:MarkdownScrollViewer
             x:Name="UpdateInfoMarkdownDocument"
             Grid.Row="1"
-            Language="zh-CN"
             Margin="16,0"
             ClickAction="DisplayWithRelativePath"
+            Language="zh-CN"
             Markdown="{Binding UpdateInfo}"
             MarkdownStyleName="GithubLike" />