Merge pull request #3493 from ShiinaRinne/AddEnableHWA

Add: 设置中添加"启用硬件加速"的选项

v2rayN/v2rayN/Mode/ConfigItems.cs

@@ -103,6 +103,8 @@ namespace v2rayN.Mode
         public bool enableSecurityProtocolTls13 { get; set; }
 
         public int trayMenuServersLimit { get; set; } = 20;
+        
+        public bool enableHWA { get; set; } = true;
     }
 
     [Serializable]

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -2509,6 +2509,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Enable hardware acceleration(Require restart) 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsEnableHWA {
+            get {
+                return ResourceManager.GetString("TbSettingsEnableHWA", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Exception 的本地化字符串。
         /// </summary>

v2rayN/v2rayN/Resx/ResUI.fa-Ir.resx

@@ -1066,4 +1066,7 @@
   <data name="TbSettingsDefUserAgentTips" xml:space="preserve">
     <value>This parameter is valid only for tcp/http and ws</value>
   </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>فعال‌سازی شتاب‌دهنده سخت‌افزاری (نیاز به راه‌اندازی مجدد)</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -1141,4 +1141,7 @@
   <data name="TbSpiderX" xml:space="preserve">
     <value>SpiderX</value>
   </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>Enable hardware acceleration(Require restart)</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.ru.resx

@@ -1108,4 +1108,7 @@
   <data name="TbSettingsFontSize" xml:space="preserve">
     <value>Размер шрифта</value>
   </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>Включить аппаратное ускорение (требуется перезагрузка)</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx

@@ -1141,4 +1141,7 @@
   <data name="TbSpiderX" xml:space="preserve">
     <value>SpiderX</value>
   </data>
+  <data name="TbSettingsEnableHWA" xml:space="preserve">
+    <value>启用硬件加速(需重启)</value>
+  </data>
 </root>

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -65,6 +65,7 @@ namespace v2rayN.ViewModels
         [Reactive] public string currentFontFamily { get; set; }
         [Reactive] public int SpeedTestTimeout { get; set; }
         [Reactive] public string SpeedTestUrl { get; set; }
+        [Reactive] public bool EnableHWA { get; set; }
 
         #endregion
 
@@ -160,6 +161,7 @@ namespace v2rayN.ViewModels
             currentFontFamily = _config.uiItem.currentFontFamily;
             SpeedTestTimeout = _config.speedTestItem.speedTestTimeout;
             SpeedTestUrl = _config.speedTestItem.speedTestUrl;
+            EnableHWA = _config.guiItem.enableHWA;
 
             #endregion
 
@@ -339,6 +341,7 @@ namespace v2rayN.ViewModels
             _config.uiItem.currentFontFamily = currentFontFamily;
             _config.speedTestItem.speedTestTimeout = SpeedTestTimeout;
             _config.speedTestItem.speedTestUrl = SpeedTestUrl;
+            _config.guiItem.enableHWA = EnableHWA;
 
             //systemProxy
             _config.systemProxyExceptions = systemProxyExceptions;

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -197,6 +197,11 @@ namespace v2rayN.Views
             {
                 WindowState = WindowState.Minimized;
             }
+            
+            if (!_config.guiItem.enableHWA)
+            {
+                RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;
+            }
         }
 
         #region Event 

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -481,6 +481,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -752,6 +753,20 @@
                             Width="300"
                             Margin="{StaticResource SettingItemMargin}"
                             Style="{StaticResource DefComboBox}" />
+                        
+                        <TextBlock
+                            Grid.Row="18"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsEnableHWA}"/>
+                        <ToggleButton
+                            x:Name="togEnableHWA"
+                            Grid.Row="18"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
                     </Grid>
                 </ScrollViewer>
             </TabItem>

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -164,6 +164,7 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.currentFontFamily, v => v.cmbcurrentFontFamily.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.EnableHWA, v => v.togEnableHWA.IsChecked).DisposeWith(disposables);
 
 
                 this.Bind(ViewModel, vm => vm.systemProxyAdvancedProtocol, v => v.cmbsystemProxyAdvancedProtocol.Text).DisposeWith(disposables);