From 1752703be5c5f8c104bdcb35020443fb68160c2c Mon Sep 17 00:00:00 2001
From: SherkeyXD <253294679@qq.com>
Date: Fri, 6 Oct 2023 19:02:14 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E7=9A=84=E6=B8=B2=E6=9F=93=E8=A1=A8=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/MaaWpfGui.csproj                |  4 +-
 .../ViewModels/UI/AnnouncementViewModel.cs    |  6 +--
 src/MaaWpfGui/Views/UI/AnnouncementView.xaml  | 51 ++++++++-----------
 3 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj
index 636ef46c63..6fa8a3195f 100644
--- a/src/MaaWpfGui/MaaWpfGui.csproj
+++ b/src/MaaWpfGui/MaaWpfGui.csproj
@@ -108,8 +108,10 @@
       <Version>3.4.5</Version>
     </PackageReference>
     <PackageReference Include="MdXaml">
-      <Version>1.15.0</Version>
+      <Version>1.21.0</Version>
     </PackageReference>
+    <PackageReference Include="MdXaml.Html" Version="1.21.0" />
+    <PackageReference Include="MdXaml.Plugins" Version="1.21.0" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
       <Version>7.1.2</Version>
     </PackageReference>
diff --git a/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs b/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs
index cc264bba60..774cc4e8a6 100644
--- a/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs
@@ -20,8 +20,7 @@ using System.Windows.Documents;
 using System.Windows.Input;
 using MaaWpfGui.Constants;
 using MaaWpfGui.Helper;
-using Markdig;
-using Markdig.Wpf;
+using MdXaml;
 using Stylet;
 
 namespace MaaWpfGui.ViewModels.UI
@@ -61,9 +60,6 @@ namespace MaaWpfGui.ViewModels.UI
             }
         }
 
-        public FlowDocument AnnouncementInfoDoc => Markdig.Wpf.Markdown.ToFlowDocument(AnnouncementInfo,
-            new MarkdownPipelineBuilder().UseSupportedExtensions().Build());
-
         /// <summary>
         /// 检查更新
         /// </summary>
diff --git a/src/MaaWpfGui/Views/UI/AnnouncementView.xaml b/src/MaaWpfGui/Views/UI/AnnouncementView.xaml
index d8d3c7e710..3e6d7997af 100644
--- a/src/MaaWpfGui/Views/UI/AnnouncementView.xaml
+++ b/src/MaaWpfGui/Views/UI/AnnouncementView.xaml
@@ -4,9 +4,10 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:hc="https://handyorg.github.io/handycontrol"
-    xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:s="https://github.com/canton7/Stylet"
+    xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml"
+    xmlns:mdplug="clr-namespace:MdXaml.Plugins;assembly=MdXaml.Plugins"
+    xmlns:mdhtml="clr-namespace:MdXaml.Html;assembly=MdXaml.Html"
     xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI"
     Title="{DynamicResource Announcement}"
     Width="600"
@@ -19,35 +20,23 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <FlowDocumentScrollViewer
-            x:Name="UpdateInfoMarkdownDocument"
-            Grid.Row="0"
-            Document="{Binding AnnouncementInfoDoc}"
-            Zoom="90">
+        <mdxam:MarkdownScrollViewer
+            ClickAction="SafetyOpenBrowser"
+            Markdown="{Binding AnnouncementInfo}"
+            Margin="10,0,10,0"
+            Zoom="120">
+            <mdxam:MarkdownScrollViewer.MarkdownStyle>
+                <Style TargetType="FlowDocument" BasedOn="{x:Static mdxam:MarkdownStyle.Sasabune}">
+                    <Setter Property="FontFamily" Value="Microsoft YaHei"/>
+                </Style>
+            </mdxam:MarkdownScrollViewer.MarkdownStyle>
+            <mdxam:MarkdownScrollViewer.Plugins>
+                <mdplug:MdXamlPlugins>
+                    <mdhtml:HtmlPluginSetup/>
+                </mdplug:MdXamlPlugins>
+            </mdxam:MarkdownScrollViewer.Plugins>
+        </mdxam:MarkdownScrollViewer>
 
-            <FlowDocumentScrollViewer.Template>
-                <ControlTemplate TargetType="FlowDocumentScrollViewer">
-                    <Border
-                        Margin="{TemplateBinding Padding}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                        Focusable="False">
-
-                        <hc:ScrollViewer
-                            x:Name="PART_ContentHost"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            CanContentScroll="True"
-                            IsInertiaEnabled="True" />
-                    </Border>
-                </ControlTemplate>
-            </FlowDocumentScrollViewer.Template>
-
-            <FlowDocumentScrollViewer.CommandBindings>
-                <CommandBinding Command="{x:Static markdig:Commands.Hyperlink}" Executed="{s:Action OpenHyperlink}" />
-            </FlowDocumentScrollViewer.CommandBindings>
-        </FlowDocumentScrollViewer>
         <CheckBox
             Grid.Row="1"
             Height="30"
@@ -57,4 +46,4 @@
             Content="{DynamicResource GachaShowDisclaimerNoMore}"
             IsChecked="{Binding DoNotRemindThisAnnouncementAgain}" />
     </Grid>
-</hc:Window>
+</hc:Window>
\ No newline at end of file

From 22b93c55928b5a4c733f4e80f3306305ebc08b05 Mon Sep 17 00:00:00 2001
From: SherkeyXD <253294679@qq.com>
Date: Fri, 6 Oct 2023 19:05:49 +0800
Subject: [PATCH 2/5] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84using?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs b/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs
index 774cc4e8a6..980284bb34 100644
--- a/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/AnnouncementViewModel.cs
@@ -20,7 +20,6 @@ using System.Windows.Documents;
 using System.Windows.Input;
 using MaaWpfGui.Constants;
 using MaaWpfGui.Helper;
-using MdXaml;
 using Stylet;
 
 namespace MaaWpfGui.ViewModels.UI

From c8112bf5874d1a69bfc98ce614765268020a866f Mon Sep 17 00:00:00 2001
From: SherkeyXD <253294679@qq.com>
Date: Fri, 6 Oct 2023 19:06:13 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20CHANGELOG=E4=B9=9F=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8MdXaml=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/UI/VersionUpdateViewModel.cs   |  4 --
 src/MaaWpfGui/Views/UI/VersionUpdateView.xaml | 54 +++++++------------
 2 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
index 57875f6139..ffefb39c40 100644
--- a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs
@@ -29,8 +29,6 @@ using MaaWpfGui.Helper;
 using MaaWpfGui.Main;
 using MaaWpfGui.Models;
 using MaaWpfGui.States;
-using Markdig;
-using Markdig.Wpf;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Semver;
@@ -116,8 +114,6 @@ namespace MaaWpfGui.ViewModels.UI
             }
         }
 
-        public FlowDocument UpdateInfoDoc => Markdig.Wpf.Markdown.ToFlowDocument(UpdateInfo,
-            new MarkdownPipelineBuilder().UseSupportedExtensions().Build());
 
         private string _updateUrl;
 
diff --git a/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml b/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml
index 77c9970f3c..1e06a8f107 100644
--- a/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml
+++ b/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml
@@ -5,10 +5,10 @@
     xmlns:controls="clr-namespace:MaaWpfGui.Styles.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:hc="https://handyorg.github.io/handycontrol"
-    xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:s="https://github.com/canton7/Stylet"
-    xmlns:styles="clr-namespace:MaaWpfGui.Styles"
+    xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml"
+    xmlns:mdplug="clr-namespace:MdXaml.Plugins;assembly=MdXaml.Plugins"
+    xmlns:mdhtml="clr-namespace:MdXaml.Html;assembly=MdXaml.Html"
     xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI"
     xmlns:viewModels="clr-namespace:MaaWpfGui.ViewModels"
     xmlns:vm="clr-namespace:MaaWpfGui"
@@ -44,36 +44,22 @@
                 TextWrapping="Wrap" />
         </StackPanel>
 
-        <FlowDocumentScrollViewer
-            x:Name="UpdateInfoMarkdownDocument"
-            Grid.Row="1"
-            Margin="16,0"
-            Document="{Binding UpdateInfoDoc}"
-            IsSelectionEnabled="False"
-            Zoom="90">
+        <mdxam:MarkdownScrollViewer
+            ClickAction="SafetyOpenBrowser"
+            Markdown="{Binding UpdateInfo}"
+            Margin="10,0,10,0"
+            Zoom="120">
+            <mdxam:MarkdownScrollViewer.MarkdownStyle>
+                <Style TargetType="FlowDocument" BasedOn="{x:Static mdxam:MarkdownStyle.Sasabune}">
+                    <Setter Property="FontFamily" Value="Microsoft YaHei" />
+                </Style>
+            </mdxam:MarkdownScrollViewer.MarkdownStyle>
+            <mdxam:MarkdownScrollViewer.Plugins>
+                <mdplug:MdXamlPlugins>
+                    <mdhtml:HtmlPluginSetup />
+                </mdplug:MdXamlPlugins>
+            </mdxam:MarkdownScrollViewer.Plugins>
+        </mdxam:MarkdownScrollViewer>
 
-            <FlowDocumentScrollViewer.Template>
-                <ControlTemplate TargetType="FlowDocumentScrollViewer">
-                    <Border
-                        Margin="{TemplateBinding Padding}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{Binding Path=(hc:BorderElement.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                        Focusable="False">
-
-                        <hc:ScrollViewer
-                            x:Name="PART_ContentHost"
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            CanContentScroll="True"
-                            IsInertiaEnabled="True" />
-                    </Border>
-                </ControlTemplate>
-            </FlowDocumentScrollViewer.Template>
-
-            <FlowDocumentScrollViewer.CommandBindings>
-                <CommandBinding Command="{x:Static markdig:Commands.Hyperlink}" Executed="{s:Action OpenHyperlink}" />
-            </FlowDocumentScrollViewer.CommandBindings>
-        </FlowDocumentScrollViewer>
     </Grid>
-</hc:Window>
+</hc:Window>
\ No newline at end of file

From 538be72ba9b3650d75344b9b9d51a02c50aae97d Mon Sep 17 00:00:00 2001
From: SherkeyXD <253294679@qq.com>
Date: Fri, 6 Oct 2023 19:36:46 +0800
Subject: [PATCH 4/5] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=85=AC?=
 =?UTF-8?q?=E5=91=8A=E5=92=8CCHANGELOG=E7=9A=84=E8=A7=86=E8=A7=89=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/Views/UI/AnnouncementView.xaml  |  2 ++
 src/MaaWpfGui/Views/UI/VersionUpdateView.xaml | 15 +++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/MaaWpfGui/Views/UI/AnnouncementView.xaml b/src/MaaWpfGui/Views/UI/AnnouncementView.xaml
index 3e6d7997af..9c1aba7adf 100644
--- a/src/MaaWpfGui/Views/UI/AnnouncementView.xaml
+++ b/src/MaaWpfGui/Views/UI/AnnouncementView.xaml
@@ -22,12 +22,14 @@
 
         <mdxam:MarkdownScrollViewer
             ClickAction="SafetyOpenBrowser"
+            Grid.Row="0"
             Markdown="{Binding AnnouncementInfo}"
             Margin="10,0,10,0"
             Zoom="120">
             <mdxam:MarkdownScrollViewer.MarkdownStyle>
                 <Style TargetType="FlowDocument" BasedOn="{x:Static mdxam:MarkdownStyle.Sasabune}">
                     <Setter Property="FontFamily" Value="Microsoft YaHei"/>
+                    <Setter Property="PagePadding" Value="10"/>
                 </Style>
             </mdxam:MarkdownScrollViewer.MarkdownStyle>
             <mdxam:MarkdownScrollViewer.Plugins>
diff --git a/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml b/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml
index 1e06a8f107..c3a1251f3c 100644
--- a/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml
+++ b/src/MaaWpfGui/Views/UI/VersionUpdateView.xaml
@@ -7,8 +7,6 @@
     xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml"
-    xmlns:mdplug="clr-namespace:MdXaml.Plugins;assembly=MdXaml.Plugins"
-    xmlns:mdhtml="clr-namespace:MdXaml.Html;assembly=MdXaml.Html"
     xmlns:ui="clr-namespace:MaaWpfGui.ViewModels.UI"
     xmlns:viewModels="clr-namespace:MaaWpfGui.ViewModels"
     xmlns:vm="clr-namespace:MaaWpfGui"
@@ -29,14 +27,14 @@
             HorizontalAlignment="Center"
             Orientation="Horizontal">
             <controls:TextBlock
-                Margin="0,10,0,5"
+                Margin="0,10,0,10"
                 VerticalAlignment="Bottom"
                 FontSize="20"
                 Style="{StaticResource TextBlockDefaultBold}"
                 Text="{DynamicResource VersionUpdatedTo}"
                 TextWrapping="Wrap" />
             <controls:TextBlock
-                Margin="0,10,0,5"
+                Margin="0,10,0,10"
                 VerticalAlignment="Bottom"
                 FontSize="20"
                 Style="{StaticResource TextBlockDefaultBold}"
@@ -46,19 +44,16 @@
 
         <mdxam:MarkdownScrollViewer
             ClickAction="SafetyOpenBrowser"
+            Grid.Row="1"
             Markdown="{Binding UpdateInfo}"
-            Margin="10,0,10,0"
+            Margin="10,10,10,0"
             Zoom="120">
             <mdxam:MarkdownScrollViewer.MarkdownStyle>
                 <Style TargetType="FlowDocument" BasedOn="{x:Static mdxam:MarkdownStyle.Sasabune}">
                     <Setter Property="FontFamily" Value="Microsoft YaHei" />
+                    <Setter Property="PagePadding" Value="10"/>
                 </Style>
             </mdxam:MarkdownScrollViewer.MarkdownStyle>
-            <mdxam:MarkdownScrollViewer.Plugins>
-                <mdplug:MdXamlPlugins>
-                    <mdhtml:HtmlPluginSetup />
-                </mdplug:MdXamlPlugins>
-            </mdxam:MarkdownScrollViewer.Plugins>
         </mdxam:MarkdownScrollViewer>
 
     </Grid>

From e2355f86f0141f2f716493f079d9475ceda4b961 Mon Sep 17 00:00:00 2001
From: SherkeyXD <253294679@qq.com>
Date: Fri, 6 Oct 2023 19:40:18 +0800
Subject: [PATCH 5/5] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/MaaWpfGui.csproj | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj
index 6fa8a3195f..07f2b4062c 100644
--- a/src/MaaWpfGui/MaaWpfGui.csproj
+++ b/src/MaaWpfGui/MaaWpfGui.csproj
@@ -107,17 +107,12 @@
     <PackageReference Include="HandyControls">
       <Version>3.4.5</Version>
     </PackageReference>
-    <PackageReference Include="MdXaml">
-      <Version>1.21.0</Version>
-    </PackageReference>
+    <PackageReference Include="MdXaml" Version="1.21.0" />
     <PackageReference Include="MdXaml.Html" Version="1.21.0" />
     <PackageReference Include="MdXaml.Plugins" Version="1.21.0" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
       <Version>7.1.2</Version>
     </PackageReference>
-    <PackageReference Include="Markdig.Wpf">
-      <Version>0.5.0.1</Version>
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.1</Version>
     </PackageReference>