Skip to content

Commit cd6bea2

Browse files
2dust2dust
committed
Improved font display
#5713
1 parent 054f0f2 commit cd6bea2

22 files changed

+59
-46
lines changed

‎v2rayN/v2rayN/App.xaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Application
22
x:Class="v2rayN.App"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
54
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
65
xmlns:conv="clr-namespace:v2rayN.Converters"
6+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
77
ShutdownMode="OnExplicitShutdown"
88
StartupUri="Views/MainWindow.xaml">
99
<Application.Resources>
@@ -181,6 +181,23 @@
181181
TargetType="{x:Type TextBlock}">
182182
<Setter Property="FontSize" Value="{DynamicResource StdFontSize-1}" />
183183
</Style>
184+
185+
<Style
186+
x:Key="WindowGlobal"
187+
BasedOn="{StaticResource {x:Type Window}}"
188+
TargetType="{x:Type Window}">
189+
<Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
190+
<Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
191+
<Setter Property="TextOptions.TextHintingMode" Value="Fixed" />
192+
</Style>
193+
<Style
194+
x:Key="ViewGlobal"
195+
BasedOn="{StaticResource {x:Type UserControl}}"
196+
TargetType="{x:Type UserControl}">
197+
<Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
198+
<Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
199+
<Setter Property="TextOptions.TextHintingMode" Value="Fixed" />
200+
</Style>
184201
</ResourceDictionary>
185202
</Application.Resources>
186203
</Application>

‎v2rayN/v2rayN/Views/AddServer2Window.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
1818
ResizeMode="NoResize"
1919
ShowInTaskbar="False"
20+
Style="{StaticResource WindowGlobal}"
2021
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2122
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
22-
TextOptions.TextFormattingMode="Display"
23-
TextOptions.TextRenderingMode="Auto"
2423
WindowStartupLocation="CenterScreen"
2524
mc:Ignorable="d">
2625
<DockPanel Margin="8">

‎v2rayN/v2rayN/Views/AddServerWindow.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
1818
ResizeMode="CanResize"
1919
ShowInTaskbar="False"
20+
Style="{StaticResource WindowGlobal}"
2021
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2122
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
22-
TextOptions.TextFormattingMode="Display"
23-
TextOptions.TextRenderingMode="Auto"
2423
WindowStartupLocation="CenterScreen"
2524
mc:Ignorable="d">
2625
<DockPanel Margin="8">

‎v2rayN/v2rayN/Views/BackupAndRestoreView.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
d:DesignHeight="600"
1313
d:DesignWidth="800"
1414
x:TypeArguments="vms:BackupAndRestoreViewModel"
15+
Style="{StaticResource ViewGlobal}"
1516
mc:Ignorable="d">
1617
<UserControl.Resources>
1718
<ResourceDictionary>

‎v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public BackupAndRestoreView()
2626
this.Bind(ViewModel, vm => vm.SelectedSource.userName, v => v.txtWebDavUserName.Text).DisposeWith(disposables);
2727
this.Bind(ViewModel, vm => vm.SelectedSource.password, v => v.txtWebDavPassword.Text).DisposeWith(disposables);
2828
this.Bind(ViewModel, vm => vm.SelectedSource.dirName, v => v.txtWebDavDirName.Text).DisposeWith(disposables);
29-
29+
3030
this.BindCommand(ViewModel, vm => vm.WebDavCheckCmd, v => v.menuWebDavCheck).DisposeWith(disposables);
3131

3232
this.BindCommand(ViewModel, vm => vm.RemoteBackupCmd, v => v.menuRemoteBackup).DisposeWith(disposables);

‎v2rayN/v2rayN/Views/CheckUpdateView.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
d:DesignHeight="450"
1313
d:DesignWidth="800"
1414
x:TypeArguments="vms:CheckUpdateViewModel"
15+
Style="{StaticResource ViewGlobal}"
1516
mc:Ignorable="d">
1617

1718
<DockPanel Margin="16">

‎v2rayN/v2rayN/Views/ClashConnectionsView.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<reactiveui:ReactiveUserControl
22
x:Class="v2rayN.Views.ClashConnectionsView"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
64
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
7-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
85
xmlns:reactiveui="http://reactiveui.net"
6+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
8+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
1010
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
1111
d:DesignHeight="450"

‎v2rayN/v2rayN/Views/ClashProxiesView.xaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<reactiveui:ReactiveUserControl
22
x:Class="v2rayN.Views.ClashProxiesView"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
5-
xmlns:reactiveui="http://reactiveui.net"
6-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
74
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:converters="clr-namespace:v2rayN.Converters"
6+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:reactiveui="http://reactiveui.net"
910
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
1011
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
11-
xmlns:converters="clr-namespace:v2rayN.Converters"
1212
d:DesignHeight="450"
1313
d:DesignWidth="800"
1414
x:TypeArguments="vms:ClashProxiesViewModel"
1515
KeyDown="ProxiesView_KeyDown"
16+
Style="{StaticResource ViewGlobal}"
1617
mc:Ignorable="d">
1718
<UserControl.Resources>
1819
<BooleanToVisibilityConverter x:Key="BoolToVisConverter" />

‎v2rayN/v2rayN/Views/DNSSettingWindow.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
1818
ResizeMode="NoResize"
1919
ShowInTaskbar="False"
20+
Style="{StaticResource WindowGlobal}"
2021
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2122
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
22-
TextOptions.TextFormattingMode="Display"
23-
TextOptions.TextRenderingMode="Auto"
2423
WindowStartupLocation="CenterScreen"
2524
mc:Ignorable="d">
2625
<DockPanel Margin="8">

‎v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
KeyDown="GlobalHotkeySettingWindow_KeyDown"
1919
ResizeMode="NoResize"
2020
ShowInTaskbar="False"
21+
Style="{StaticResource WindowGlobal}"
2122
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2223
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
23-
TextOptions.TextFormattingMode="Display"
24-
TextOptions.TextRenderingMode="Auto"
2524
WindowStartupLocation="CenterScreen"
2625
mc:Ignorable="d">
2726
<DockPanel Margin="8">

‎v2rayN/v2rayN/Views/MainWindow.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
Background="{DynamicResource MaterialDesignPaper}"
1919
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2020
ShowInTaskbar="True"
21+
Style="{StaticResource WindowGlobal}"
2122
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2223
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
23-
TextOptions.TextFormattingMode="Display"
24-
TextOptions.TextRenderingMode="Auto"
2524
WindowStartupLocation="CenterScreen"
2625
mc:Ignorable="d">
2726
<Window.Resources>

‎v2rayN/v2rayN/Views/MainWindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public MainWindow()
145145
});
146146

147147
this.Title = $"{Utils.GetVersion()} - {(IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
148-
148+
149149
if (!_config.guiItem.enableHWA)
150150
{
151151
RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;

‎v2rayN/v2rayN/Views/MsgView.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
d:DesignHeight="450"
1212
d:DesignWidth="800"
1313
x:TypeArguments="vms:MsgViewModel"
14+
Style="{StaticResource ViewGlobal}"
1415
mc:Ignorable="d">
1516
<DockPanel Margin="2">
1617
<WrapPanel

‎v2rayN/v2rayN/Views/OptionSettingWindow.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
1818
ResizeMode="NoResize"
1919
ShowInTaskbar="False"
20+
Style="{StaticResource WindowGlobal}"
2021
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2122
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
22-
TextOptions.TextFormattingMode="Display"
23-
TextOptions.TextRenderingMode="Auto"
2423
WindowStartupLocation="CenterScreen"
2524
mc:Ignorable="d">
2625
<DockPanel Margin="8">

‎v2rayN/v2rayN/Views/ProfilesView.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
d:DesignHeight="450"
1414
d:DesignWidth="800"
1515
x:TypeArguments="vms:ProfilesViewModel"
16+
Style="{StaticResource ViewGlobal}"
1617
mc:Ignorable="d">
1718
<UserControl.Resources>
1819
<BooleanToVisibilityConverter x:Key="BoolToVisConverter" />

‎v2rayN/v2rayN/Views/QrcodeView.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
99
d:DesignHeight="300"
1010
d:DesignWidth="300"
11+
Style="{StaticResource ViewGlobal}"
1112
mc:Ignorable="d">
1213
<Grid Margin="30">
1314
<Grid.RowDefinitions>

‎v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<reactiveui:ReactiveWindow
22
x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
5-
xmlns:reactiveui="http://reactiveui.net"
6-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
74
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:conv="clr-namespace:v2rayN.Converters"
6+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:reactiveui="http://reactiveui.net"
910
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
1011
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
11-
xmlns:conv="clr-namespace:v2rayN.Converters"
1212
Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"
1313
Width="900"
1414
Height="700"
@@ -17,10 +17,9 @@
1717
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
1818
ResizeMode="NoResize"
1919
ShowInTaskbar="False"
20+
Style="{StaticResource WindowGlobal}"
2021
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2122
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
22-
TextOptions.TextFormattingMode="Display"
23-
TextOptions.TextRenderingMode="Auto"
2423
WindowStartupLocation="CenterScreen"
2524
mc:Ignorable="d">
2625
<DockPanel>

‎v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<reactiveui:ReactiveWindow
22
x:Class="v2rayN.Views.RoutingRuleSettingWindow"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
5-
xmlns:reactiveui="http://reactiveui.net"
6-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
74
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:conv="clr-namespace:v2rayN.Converters"
6+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:reactiveui="http://reactiveui.net"
910
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
1011
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
11-
xmlns:conv="clr-namespace:v2rayN.Converters"
1212
Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
1313
Width="960"
1414
Height="700"
@@ -17,10 +17,9 @@
1717
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
1818
ResizeMode="NoResize"
1919
ShowInTaskbar="False"
20+
Style="{StaticResource WindowGlobal}"
2021
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2122
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
22-
TextOptions.TextFormattingMode="Display"
23-
TextOptions.TextRenderingMode="Auto"
2423
WindowStartupLocation="CenterScreen"
2524
mc:Ignorable="d">
2625
<DockPanel>

‎v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
1818
ResizeMode="NoResize"
1919
ShowInTaskbar="False"
20+
Style="{StaticResource WindowGlobal}"
2021
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2122
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
22-
TextOptions.TextFormattingMode="Display"
23-
TextOptions.TextRenderingMode="Auto"
2423
WindowStartupLocation="CenterScreen"
2524
mc:Ignorable="d">
2625
<Window.Resources>

‎v2rayN/v2rayN/Views/SubEditWindow.xaml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<reactiveui:ReactiveWindow
22
x:Class="v2rayN.Views.SubEditWindow"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
5-
xmlns:reactiveui="http://reactiveui.net"
6-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
74
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:conv="clr-namespace:v2rayN.Converters"
6+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9+
xmlns:reactiveui="http://reactiveui.net"
910
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
1011
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
11-
xmlns:conv="clr-namespace:v2rayN.Converters"
1212
Title="{x:Static resx:ResUI.menuSubSetting}"
1313
Width="700"
1414
Height="600"
@@ -17,10 +17,9 @@
1717
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
1818
ResizeMode="NoResize"
1919
ShowInTaskbar="False"
20+
Style="{StaticResource WindowGlobal}"
2021
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2122
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
22-
TextOptions.TextFormattingMode="Display"
23-
TextOptions.TextRenderingMode="Auto"
2423
WindowStartupLocation="CenterScreen"
2524
mc:Ignorable="d">
2625
<Window.Resources>

‎v2rayN/v2rayN/Views/SubSettingWindow.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717
FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
1818
ResizeMode="NoResize"
1919
ShowInTaskbar="False"
20+
Style="{StaticResource WindowGlobal}"
2021
TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
2122
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
22-
TextOptions.TextFormattingMode="Display"
23-
TextOptions.TextRenderingMode="Auto"
2423
WindowStartupLocation="CenterScreen"
2524
mc:Ignorable="d">
2625
<materialDesign:DialogHost

‎v2rayN/v2rayN/Views/ThemeSettingView.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<reactiveui:ReactiveUserControl
22
x:Class="v2rayN.Views.ThemeSettingView"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:reactiveui="http://reactiveui.net"
5-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
64
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
76
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
xmlns:reactiveui="http://reactiveui.net"
88
xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
99
xmlns:vms="clr-namespace:v2rayN.ViewModels"
1010
d:DesignHeight="450"
1111
d:DesignWidth="800"
1212
x:TypeArguments="vms:ThemeSettingViewModel"
13+
Style="{StaticResource ViewGlobal}"
1314
mc:Ignorable="d">
1415
<StackPanel Margin="8">
1516
<Grid>

0 commit comments

Comments
 (0)