diff --git a/v2rayN/v2rayN/App.xaml b/v2rayN/v2rayN/App.xaml index 3b7aefeec9..e8c8bfb146 100644 --- a/v2rayN/v2rayN/App.xaml +++ b/v2rayN/v2rayN/App.xaml @@ -1,9 +1,9 @@  @@ -181,6 +181,23 @@ TargetType="{x:Type TextBlock}"> + + + \ No newline at end of file diff --git a/v2rayN/v2rayN/Views/AddServer2Window.xaml b/v2rayN/v2rayN/Views/AddServer2Window.xaml index 4e8b003c19..b196a21234 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"> diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml index 64fa23ec4a..f23efe2584 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"> diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml index 16b41c4421..219893bb5c 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"> diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs index bf6b08bef0..34c6dc1d30 100644 --- a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs +++ b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs @@ -26,7 +26,7 @@ public BackupAndRestoreView() 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 0f101a0d51..6ec007ea37 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"> diff --git a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml index b9e3ef5e2c..90ff314263 100644 --- a/v2rayN/v2rayN/Views/ClashConnectionsView.xaml +++ b/v2rayN/v2rayN/Views/ClashConnectionsView.xaml @@ -1,11 +1,11 @@ diff --git a/v2rayN/v2rayN/Views/DNSSettingWindow.xaml b/v2rayN/v2rayN/Views/DNSSettingWindow.xaml index 7776e4186c..bfdc833882 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"> diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml index 37bf6e235e..904217d2bc 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"> diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml index c8f3cf9ff0..9ed581b003 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"> diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs index 8fdbb1665d..8fca88cf56 100644 --- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs @@ -145,7 +145,7 @@ public MainWindow() }); 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 18445008ca..491950d72e 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"> diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml b/v2rayN/v2rayN/Views/ProfilesView.xaml index 5a5f1532e0..8bfe2d9824 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"> diff --git a/v2rayN/v2rayN/Views/QrcodeView.xaml b/v2rayN/v2rayN/Views/QrcodeView.xaml index 602138efcd..b24111c2b5 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"> diff --git a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml index 7ff01c0a61..4de2a494db 100644 --- a/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml +++ b/v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml @@ -1,14 +1,14 @@  diff --git a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml index 1292f71448..cf2d465445 100644 --- a/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml +++ b/v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml @@ -1,14 +1,14 @@  diff --git a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml index 11be6eb397..18bc01681b 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"> diff --git a/v2rayN/v2rayN/Views/SubEditWindow.xaml b/v2rayN/v2rayN/Views/SubEditWindow.xaml index f56ad0dfe5..b571a74d19 100644 --- a/v2rayN/v2rayN/Views/SubEditWindow.xaml +++ b/v2rayN/v2rayN/Views/SubEditWindow.xaml @@ -1,14 +1,14 @@  diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml b/v2rayN/v2rayN/Views/SubSettingWindow.xaml index 4c7abbaf53..65177272d7 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">