From 171ed6f58f057e326ec78b3dd20db92dd34b7d41 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sun, 19 Apr 2026 09:06:15 +0000
Subject: [PATCH] Custom MessageBoxDialog (#9147)

---
 v2rayN/Directory.Packages.props               |  2 +-
 v2rayN/v2rayN.Desktop/Common/ButtonResult.cs  |  8 +++
 v2rayN/v2rayN.Desktop/Common/UI.cs            |  7 +--
 v2rayN/v2rayN.Desktop/GlobalUsings.cs         |  1 -
 .../Views/MessageBoxDialog.axaml              | 53 +++++++++++++++++++
 .../Views/MessageBoxDialog.axaml.cs           | 27 ++++++++++
 v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj   |  2 +-
 7 files changed, 94 insertions(+), 6 deletions(-)
 create mode 100644 v2rayN/v2rayN.Desktop/Common/ButtonResult.cs
 create mode 100644 v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml
 create mode 100644 v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml.cs

diff --git a/v2rayN/Directory.Packages.props b/v2rayN/Directory.Packages.props
index d441b382..453c4d40 100644
--- a/v2rayN/Directory.Packages.props
+++ b/v2rayN/Directory.Packages.props
@@ -9,13 +9,13 @@
     <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.13" />
     <PackageVersion Include="Avalonia.Desktop" Version="11.3.13" />
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.13" />
+    <PackageVersion Include="DialogHost.Avalonia" Version="0.11.0" />
     <PackageVersion Include="ReactiveUI.Avalonia" Version="11.4.12" />
     <PackageVersion Include="CliWrap" Version="3.10.1" />
     <PackageVersion Include="Downloader" Version="5.1.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.4.1" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.3.1" />
-    <PackageVersion Include="MessageBox.Avalonia" Version="3.3.1.1" />
     <PackageVersion Include="QRCoder" Version="1.8.0" />
     <PackageVersion Include="ReactiveUI" Version="23.2.1" />
     <PackageVersion Include="ReactiveUI.Fody" Version="19.5.41" />
diff --git a/v2rayN/v2rayN.Desktop/Common/ButtonResult.cs b/v2rayN/v2rayN.Desktop/Common/ButtonResult.cs
new file mode 100644
index 00000000..6f939d8d
--- /dev/null
+++ b/v2rayN/v2rayN.Desktop/Common/ButtonResult.cs
@@ -0,0 +1,8 @@
+namespace v2rayN.Desktop.Common;
+
+public enum ButtonResult
+{
+    None = 0,
+    Yes = 1,
+    No = 2
+}
diff --git a/v2rayN/v2rayN.Desktop/Common/UI.cs b/v2rayN/v2rayN.Desktop/Common/UI.cs
index c17d8947..990e3c68 100644
--- a/v2rayN/v2rayN.Desktop/Common/UI.cs
+++ b/v2rayN/v2rayN.Desktop/Common/UI.cs
@@ -1,5 +1,5 @@
 using Avalonia.Platform.Storage;
-using MsBox.Avalonia;
+using v2rayN.Desktop.Views;
 
 namespace v2rayN.Desktop.Common;
 
@@ -9,8 +9,9 @@ internal class UI
 
     public static async Task<ButtonResult> ShowYesNo(Window owner, string msg)
     {
-        var box = MessageBoxManager.GetMessageBoxStandard(caption, msg, ButtonEnum.YesNo);
-        return await box.ShowWindowDialogAsync(owner);
+        var box = new MessageBoxDialog(caption, msg);
+        var result = await box.ShowDialog<ButtonResult>(owner);
+        return result == ButtonResult.Yes ? ButtonResult.Yes : ButtonResult.No;
     }
 
     public static async Task<string?> OpenFileDialog(Window owner, FilePickerFileType? filter)
diff --git a/v2rayN/v2rayN.Desktop/GlobalUsings.cs b/v2rayN/v2rayN.Desktop/GlobalUsings.cs
index e7499b01..5b0b2158 100644
--- a/v2rayN/v2rayN.Desktop/GlobalUsings.cs
+++ b/v2rayN/v2rayN.Desktop/GlobalUsings.cs
@@ -20,7 +20,6 @@ global using Avalonia.Platform;
 global using Avalonia.Styling;
 global using Avalonia.Threading;
 global using DynamicData;
-global using MsBox.Avalonia.Enums;
 global using ReactiveUI;
 global using ReactiveUI.Avalonia;
 global using ReactiveUI.Fody.Helpers;
diff --git a/v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml b/v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml
new file mode 100644
index 00000000..dae11854
--- /dev/null
+++ b/v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml
@@ -0,0 +1,53 @@
+<Window
+    x:Class="v2rayN.Desktop.Views.MessageBoxDialog"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    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"
+    Width="420"
+    MinWidth="350"
+    MaxWidth="600"
+    CanResize="False"
+    ShowInTaskbar="False"
+    SizeToContent="Height"
+    SystemDecorations="Full"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
+
+    <Grid Margin="24" RowDefinitions="*,Auto">
+        <ScrollViewer
+            Grid.Row="0"
+            MinHeight="60"
+            MaxHeight="300"
+            Margin="0,0,0,24"
+            HorizontalScrollBarVisibility="Disabled"
+            VerticalScrollBarVisibility="Auto">
+            <TextBlock
+                x:Name="txtMessage"
+                VerticalAlignment="Center"
+                FontSize="14"
+                LineHeight="22"
+                TextWrapping="Wrap" />
+        </ScrollViewer>
+
+        <StackPanel
+            Grid.Row="1"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal"
+            Spacing="12">
+            <Button
+                x:Name="btnYes"
+                MinWidth="90"
+                HorizontalContentAlignment="Center"
+                Content="{x:Static resx:ResUI.TbConfirm}"
+                IsDefault="True" />
+            <Button
+                x:Name="btnNo"
+                MinWidth="90"
+                HorizontalContentAlignment="Center"
+                Content="{x:Static resx:ResUI.TbCancel}"
+                IsCancel="True" />
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml.cs b/v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml.cs
new file mode 100644
index 00000000..12750144
--- /dev/null
+++ b/v2rayN/v2rayN.Desktop/Views/MessageBoxDialog.axaml.cs
@@ -0,0 +1,27 @@
+using v2rayN.Desktop.Common;
+
+namespace v2rayN.Desktop.Views;
+
+public partial class MessageBoxDialog : Window
+{
+    public MessageBoxDialog(string caption, string message)
+    {
+        InitializeComponent();
+
+        Title = caption;
+        txtMessage.Text = message;
+
+        btnYes.Click += BtnYes_Click;
+        btnNo.Click += BtnNo_Click;
+    }
+
+    private void BtnYes_Click(object? sender, RoutedEventArgs e)
+    {
+        Close(ButtonResult.Yes);
+    }
+
+    private void BtnNo_Click(object? sender, RoutedEventArgs e)
+    {
+        Close(ButtonResult.No);
+    }
+}
diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
index 71773766..fc60c249 100644
--- a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
+++ b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
@@ -16,8 +16,8 @@
 		</PackageReference>
 		<PackageReference Include="Avalonia.Desktop" />
 		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
+		<PackageReference Include="DialogHost.Avalonia" />
 		<PackageReference Include="ReactiveUI.Avalonia" />
-		<PackageReference Include="MessageBox.Avalonia" />
 		<PackageReference Include="Semi.Avalonia" />
 		<PackageReference Include="Semi.Avalonia.AvaloniaEdit" />
 		<PackageReference Include="Semi.Avalonia.DataGrid">