From cd6bea28b6fb05befa5f5ce8533194cd94143d32 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Mon, 23 Sep 2024 14:10:58 +0800
Subject: [PATCH] Improved font display

https://github.com/2dust/v2rayN/issues/5713
---
 v2rayN/v2rayN/App.xaml                        | 19 ++++++++++++++++++-
 v2rayN/v2rayN/Views/AddServer2Window.xaml     |  3 +--
 v2rayN/v2rayN/Views/AddServerWindow.xaml      |  3 +--
 v2rayN/v2rayN/Views/BackupAndRestoreView.xaml |  1 +
 .../v2rayN/Views/BackupAndRestoreView.xaml.cs |  2 +-
 v2rayN/v2rayN/Views/CheckUpdateView.xaml      |  1 +
 v2rayN/v2rayN/Views/ClashConnectionsView.xaml |  6 +++---
 v2rayN/v2rayN/Views/ClashProxiesView.xaml     |  9 +++++----
 v2rayN/v2rayN/Views/DNSSettingWindow.xaml     |  3 +--
 .../Views/GlobalHotkeySettingWindow.xaml      |  3 +--
 v2rayN/v2rayN/Views/MainWindow.xaml           |  3 +--
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |  2 +-
 v2rayN/v2rayN/Views/MsgView.xaml              |  1 +
 v2rayN/v2rayN/Views/OptionSettingWindow.xaml  |  3 +--
 v2rayN/v2rayN/Views/ProfilesView.xaml         |  1 +
 v2rayN/v2rayN/Views/QrcodeView.xaml           |  1 +
 .../Views/RoutingRuleDetailsWindow.xaml       | 11 +++++------
 .../Views/RoutingRuleSettingWindow.xaml       | 11 +++++------
 v2rayN/v2rayN/Views/RoutingSettingWindow.xaml |  3 +--
 v2rayN/v2rayN/Views/SubEditWindow.xaml        | 11 +++++------
 v2rayN/v2rayN/Views/SubSettingWindow.xaml     |  3 +--
 v2rayN/v2rayN/Views/ThemeSettingView.xaml     |  5 +++--
 22 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml
index 3b7aefee..e8c8bfb1 100644
--- a/v2rayN/v2rayN/App.xaml
+++ b/v2rayN/v2rayN/App.xaml
@@ -1,9 +1,9 @@
 <Application
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
@@ -181,6 +181,23 @@
                 TargetType="{x:Type TextBlock}">
                 <Setter Property="FontSize" Value="{DynamicResource StdFontSize-1}" />
             </Style>
+
+            <Style
+                x:Key="WindowGlobal"
+                BasedOn="{StaticResource {x:Type Window}}"
+                TargetType="{x:Type Window}">
+                <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
+                <Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
+                <Setter Property="TextOptions.TextHintingMode" Value="Fixed" />
+            </Style>
+            <Style
+                x:Key="ViewGlobal"
+                BasedOn="{StaticResource {x:Type UserControl}}"
+                TargetType="{x:Type UserControl}">
+                <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
+                <Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
+                <Setter Property="TextOptions.TextHintingMode" Value="Fixed" />
+            </Style>
         </ResourceDictionary>
     </Application.Resources>
 </Application>
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml
index 4e8b003c..b196a212 100644
--- a/v2rayN/v2rayN/Views/AddServer2Window.xaml
+++ b/v2rayN/v2rayN/Views/AddServer2Window.xaml
@@ -17,10 +17,9 @@
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="8">
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
index 64fa23ec..f23efe25 100644
--- a/v2rayN/v2rayN/Views/AddServerWindow.xaml
+++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml
@@ -17,10 +17,9 @@
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="CanResize"
     ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="8">
diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
index 16b41c44..219893bb 100644
--- a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
+++ b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
@@ -12,6 +12,7 @@
     d:DesignHeight="600"
     d:DesignWidth="800"
     x:TypeArguments="vms:BackupAndRestoreViewModel"
+    Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
index bf6b08be..34c6dc1d 100644
--- a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
+++ b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
@@ -26,7 +26,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.SelectedSource.userName, v => v.txtWebDavUserName.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.password, v => v.txtWebDavPassword.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.dirName, v => v.txtWebDavDirName.Text).DisposeWith(disposables);
-                
+
                 this.BindCommand(ViewModel, vm => vm.WebDavCheckCmd, v => v.menuWebDavCheck).DisposeWith(disposables);
 
                 this.BindCommand(ViewModel, vm => vm.RemoteBackupCmd, v => v.menuRemoteBackup).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN/Views/CheckUpdateView.xaml b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
index 0f101a0d..6ec007ea 100644
--- a/v2rayN/v2rayN/Views/CheckUpdateView.xaml
+++ b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
@@ -12,6 +12,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:TypeArguments="vms:CheckUpdateViewModel"
+    Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
 
     <DockPanel Margin="16">
diff --git a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
index b9e3ef5e..90ff3142 100644
--- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
+++ b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml
@@ -1,11 +1,11 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashConnectionsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     d:DesignHeight="450"
diff --git a/v2rayN/v2rayN/Views/ClashProxiesView.xaml b/v2rayN/v2rayN/Views/ClashProxiesView.xaml
index 53f5d803..8e964f93 100644
--- a/v2rayN/v2rayN/Views/ClashProxiesView.xaml
+++ b/v2rayN/v2rayN/Views/ClashProxiesView.xaml
@@ -1,18 +1,19 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashProxiesView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:converters="clr-namespace:v2rayN.Converters"
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:TypeArguments="vms:ClashProxiesViewModel"
     KeyDown="ProxiesView_KeyDown"
+    Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
     <UserControl.Resources>
         <BooleanToVisibilityConverter x:Key="BoolToVisConverter" />
diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
index 7776e418..bfdc8338 100644
--- a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml
@@ -17,10 +17,9 @@
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="8">
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
index 37bf6e23..904217d2 100644
--- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml
@@ -18,10 +18,9 @@
     KeyDown="GlobalHotkeySettingWindow_KeyDown"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="8">
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index c8f3cf9f..9ed581b0 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -18,10 +18,9 @@
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ShowInTaskbar="True"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <Window.Resources>
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index 8fdbb166..8fca88cf 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -145,7 +145,7 @@ namespace v2rayN.Views
             });
 
             this.Title = $"{Utils.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
-      
+
             if (!_config.guiItem.enableHWA)
             {
                 RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;
diff --git a/v2rayN/v2rayN/Views/MsgView.xaml b/v2rayN/v2rayN/Views/MsgView.xaml
index 18445008..491950d7 100644
--- a/v2rayN/v2rayN/Views/MsgView.xaml
+++ b/v2rayN/v2rayN/Views/MsgView.xaml
@@ -11,6 +11,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:TypeArguments="vms:MsgViewModel"
+    Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
     <DockPanel Margin="2">
         <WrapPanel
diff --git a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
index 22292711..baa5d8d7 100644
--- a/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/OptionSettingWindow.xaml
@@ -17,10 +17,9 @@
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="8">
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml b/v2rayN/v2rayN/Views/ProfilesView.xaml
index 5a5f1532..8bfe2d98 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml
@@ -13,6 +13,7 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:TypeArguments="vms:ProfilesViewModel"
+    Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
     <UserControl.Resources>
         <BooleanToVisibilityConverter x:Key="BoolToVisConverter" />
diff --git a/v2rayN/v2rayN/Views/QrcodeView.xaml b/v2rayN/v2rayN/Views/QrcodeView.xaml
index 602138ef..b24111c2 100644
--- a/v2rayN/v2rayN/Views/QrcodeView.xaml
+++ b/v2rayN/v2rayN/Views/QrcodeView.xaml
@@ -8,6 +8,7 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     d:DesignHeight="300"
     d:DesignWidth="300"
+    Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
     <Grid Margin="30">
         <Grid.RowDefinitions>
diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
index 7ff01c0a..4de2a494 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml
@@ -1,14 +1,14 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"
     Width="900"
     Height="700"
@@ -17,10 +17,9 @@
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel>
diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
index 1292f714..cf2d4654 100644
--- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml
@@ -1,14 +1,14 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
     Width="960"
     Height="700"
@@ -17,10 +17,9 @@
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel>
diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
index 11be6eb3..18bc0168 100644
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -17,10 +17,9 @@
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <Window.Resources>
diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml
index f56ad0df..b571a74d 100644
--- a/v2rayN/v2rayN/Views/SubEditWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml
@@ -1,14 +1,14 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     Title="{x:Static resx:ResUI.menuSubSetting}"
     Width="700"
     Height="600"
@@ -17,10 +17,9 @@
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <Window.Resources>
diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
index 4c7abbaf..65177272 100644
--- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml
@@ -17,10 +17,9 @@
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="NoResize"
     ShowInTaskbar="False"
+    Style="{StaticResource WindowGlobal}"
     TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     TextElement.Foreground="{DynamicResource MaterialDesignBody}"
-    TextOptions.TextFormattingMode="Display"
-    TextOptions.TextRenderingMode="Auto"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <materialDesign:DialogHost
diff --git a/v2rayN/v2rayN/Views/ThemeSettingView.xaml b/v2rayN/v2rayN/Views/ThemeSettingView.xaml
index a1dcef0d..7559e25c 100644
--- a/v2rayN/v2rayN/Views/ThemeSettingView.xaml
+++ b/v2rayN/v2rayN/Views/ThemeSettingView.xaml
@@ -1,15 +1,16 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ThemeSettingView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     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:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:TypeArguments="vms:ThemeSettingViewModel"
+    Style="{StaticResource ViewGlobal}"
     mc:Ignorable="d">
     <StackPanel Margin="8">
         <Grid>