Bug fix

2dust · 2dust · commit 4b9ddb803f32 · 2024-05-07T14:15:08.000+08:00
diff --git a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs
@@ -56,7 +56,7 @@ public AddServer2ViewModel(ProfileItem profileItem, Window view)
                 SaveServer();
             });
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveServer()
diff --git a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs
@@ -44,7 +44,7 @@ public AddServerViewModel(ProfileItem profileItem, Window view)
                 SaveServer();
             });
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveServer()
diff --git a/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs
@@ -56,7 +56,7 @@ public DNSSettingViewModel(Window view)
                 tunDNS2 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);
             });
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveSetting()
diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs
@@ -196,7 +196,7 @@ public OptionSettingViewModel(Window view)
                 SaveSetting();
             });
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void InitCoreType()
diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs
@@ -62,7 +62,7 @@ public RoutingRuleDetailsViewModel(RulesItem rulesItem, Window view)
                 SaveRules();
             });
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveRules()
diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs
@@ -115,7 +115,7 @@ public RoutingRuleSettingViewModel(RoutingItem routingItem, Window view)
                 SaveRouting();
             });
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         public void RefreshRulesItems()
diff --git a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs
@@ -126,7 +126,7 @@ public RoutingSettingViewModel(Window view)
                 SaveRouting();
             });
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         #region locked
diff --git a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs
@@ -40,7 +40,7 @@ public SubEditViewModel(SubItem subItem, Window view)
                 SaveSub();
             });
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         private void SaveSub()
diff --git a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs
@@ -62,7 +62,7 @@ public SubSettingViewModel(Window view)
                 SubShare();
             }, canEditRemove);
 
-            Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
         }
 
         public void RefreshSubItems()
diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs
@@ -39,7 +39,7 @@ public GlobalHotkeySettingWindow()
 
             HotkeyHandler.Instance.IsPause = true;
             this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;
-            Utils.SetDarkBorder(this, _config.uiItem.colorModeDark);
+            Utils.SetDarkBorder(this, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);
             InitData();
         }
 
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -15,6 +15,7 @@
     Title="v2rayN"
     Width="900"
     Height="700"
+    MinWidth="900"
     x:TypeArguments="vms:MainWindowViewModel"
     Background="{DynamicResource MaterialDesignPaper}"
     FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public AddServer2ViewModel(ProfileItem profileItem, Window view)`
`56`	`56`	`SaveServer();`
`57`	`57`	`});`
`58`	`58`
`59`		`- Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);`
	`59`	`+ Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`private void SaveServer()`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public AddServerViewModel(ProfileItem profileItem, Window view)`
`44`	`44`	`SaveServer();`
`45`	`45`	`});`
`46`	`46`
`47`		`- Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);`
	`47`	`+ Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`private void SaveServer()`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public DNSSettingViewModel(Window view)`
`56`	`56`	`tunDNS2 = Utils.GetEmbedText(Global.TunSingboxDNSFileName);`
`57`	`57`	`});`
`58`	`58`
`59`		`- Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);`
	`59`	`+ Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`private void SaveSetting()`
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ public OptionSettingViewModel(Window view)`
`196`	`196`	`SaveSetting();`
`197`	`197`	`});`
`198`	`198`
`199`		`- Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);`
	`199`	`+ Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`private void InitCoreType()`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public RoutingRuleDetailsViewModel(RulesItem rulesItem, Window view)`
`62`	`62`	`SaveRules();`
`63`	`63`	`});`
`64`	`64`
`65`		`- Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);`
	`65`	`+ Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`private void SaveRules()`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ public RoutingRuleSettingViewModel(RoutingItem routingItem, Window view)`
`115`	`115`	`SaveRouting();`
`116`	`116`	`});`
`117`	`117`
`118`		`- Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);`
	`118`	`+ Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public void RefreshRulesItems()`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public RoutingSettingViewModel(Window view)`
`126`	`126`	`SaveRouting();`
`127`	`127`	`});`
`128`	`128`
`129`		`- Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);`
	`129`	`+ Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`#region locked`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public SubEditViewModel(SubItem subItem, Window view)`
`40`	`40`	`SaveSub();`
`41`	`41`	`});`
`42`	`42`
`43`		`- Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);`
	`43`	`+ Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private void SaveSub()`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public SubSettingViewModel(Window view)`
`62`	`62`	`SubShare();`
`63`	`63`	`}, canEditRemove);`
`64`	`64`
`65`		`- Utils.SetDarkBorder(view, _config.uiItem.colorModeDark);`
	`65`	`+ Utils.SetDarkBorder(view, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public void RefreshSubItems()`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public GlobalHotkeySettingWindow()`
`39`	`39`
`40`	`40`	`HotkeyHandler.Instance.IsPause = true;`
`41`	`41`	`this.Closing += (s, e) => HotkeyHandler.Instance.IsPause = false;`
`42`		`- Utils.SetDarkBorder(this, _config.uiItem.colorModeDark);`
	`42`	`+ Utils.SetDarkBorder(this, _config.uiItem.followSystemTheme ? !Utils.IsLightTheme() : _config.uiItem.colorModeDark);`
`43`	`43`	`InitData();`
`44`	`44`	`}`
`45`	`45`