From 148d6ef90b7e0d407b42c765b8b5cc3afaf58661 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 25 Sep 2025 17:03:32 +0800
Subject: [PATCH] Add avaloniaEdit for test

---
 v2rayN/Directory.Packages.props               |  3 +-
 v2rayN/v2rayN.Desktop/App.axaml               |  1 +
 .../Assets/GlobalResources.axaml              |  2 ++
 v2rayN/v2rayN.Desktop/Views/MsgView.axaml     | 33 ++++---------------
 v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj   |  1 +
 5 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index 24484112..e77fac13 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -5,6 +5,7 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
+    <PackageVersion Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
     <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
@@ -27,4 +28,4 @@
     <PackageVersion Include="YamlDotNet" Version="16.3.0" />
     <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/v2rayN/v2rayN.Desktop/App.axaml b/v2rayN/v2rayN.Desktop/App.axaml
index 8b61125f..4b2577ca 100644
--- a/v2rayN/v2rayN.Desktop/App.axaml
+++ b/v2rayN/v2rayN.Desktop/App.axaml
@@ -13,6 +13,7 @@
         <semi:SemiTheme />
         <StyleInclude Source="Assets/GlobalStyles.axaml" />
         <StyleInclude Source="avares://Semi.Avalonia.DataGrid/Index.axaml" />
+        <StyleInclude Source="avares://AvaloniaEdit/Themes/Simple/AvaloniaEdit.xaml" />
         <dialogHost:DialogHostStyles />
     </Application.Styles>
     <Application.Resources>
diff --git a/v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml b/v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml
index f58db043..4cf9c585 100644
--- a/v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml
+++ b/v2rayN/v2rayN.Desktop/Assets/GlobalResources.axaml
@@ -11,6 +11,8 @@
     <x:Double x:Key="IconButtonWidth">32</x:Double>
     <x:Double x:Key="IconButtonHeight">32</x:Double>
     <x:Double x:Key="MenuFlyoutMaxHeight">1000</x:Double>
+    <x:Double x:Key="FontSizeNormal">14</x:Double>
+    <FontFamily x:Key="ContentControlThemeFontFamily">Cascadia Code,Consolas,Menlo,Monospace</FontFamily>
 
     <Thickness x:Key="Margin2">2</Thickness>
     <Thickness x:Key="MarginLr4">4,0</Thickness>
diff --git a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
index b6ca81a1..596de846 100644
--- a/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/MsgView.axaml
@@ -2,6 +2,7 @@
     x:Class="v2rayN.Desktop.Views.MsgView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:avaloniaEdit="clr-namespace:AvaloniaEdit;assembly=AvaloniaEdit"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
@@ -71,34 +72,12 @@
         </WrapPanel>
 
         <ScrollViewer x:Name="msgScrollViewer" VerticalScrollBarVisibility="Auto">
-            <SelectableTextBlock
+            <avaloniaEdit:TextEditor
                 Name="txtMsg"
-                Margin="{StaticResource Margin8}"
-                VerticalAlignment="Stretch"
-                Classes="TextArea"
-                TextAlignment="Left"
-                TextWrapping="Wrap">
-                <SelectableTextBlock.ContextMenu>
-                    <ContextMenu>
-                        <MenuItem
-                            x:Name="menuMsgViewSelectAll"
-                            Click="menuMsgViewSelectAll_Click"
-                            Header="{x:Static resx:ResUI.menuMsgViewSelectAll}" />
-                        <MenuItem
-                            x:Name="menuMsgViewCopy"
-                            Click="menuMsgViewCopy_Click"
-                            Header="{x:Static resx:ResUI.menuMsgViewCopy}" />
-                        <MenuItem
-                            x:Name="menuMsgViewCopyAll"
-                            Click="menuMsgViewCopyAll_Click"
-                            Header="{x:Static resx:ResUI.menuMsgViewCopyAll}" />
-                        <MenuItem
-                            x:Name="menuMsgViewClear"
-                            Click="menuMsgViewClear_Click"
-                            Header="{x:Static resx:ResUI.menuMsgViewClear}" />
-                    </ContextMenu>
-                </SelectableTextBlock.ContextMenu>
-            </SelectableTextBlock>
+                HorizontalScrollBarVisibility="Auto"
+                IsReadOnly="True"
+                ShowLineNumbers="True"
+                VerticalScrollBarVisibility="Auto" />
         </ScrollViewer>
     </DockPanel>
 </UserControl>
diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
index 8c274a69..67e57f4a 100644
--- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
+++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
@@ -9,6 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Avalonia.AvaloniaEdit" />
 		<PackageReference Include="Avalonia.Controls.DataGrid">
 			<TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>