From 26bf7c149ca6b398c9efd64aa7084890739af316 Mon Sep 17 00:00:00 2001 From: FrzMtrsprt Date: Sun, 1 Jan 2023 21:18:10 +0800 Subject: [PATCH] Dark border for every window --- v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs | 1 + v2rayN/v2rayN/ViewModels/AddServerViewModel.cs | 1 + v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs | 2 ++ v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs | 1 + v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs | 2 ++ v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs | 2 ++ v2rayN/v2rayN/ViewModels/SubEditViewModel.cs | 2 ++ v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs | 5 ++++- v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs | 2 ++ v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs | 2 +- 10 files changed, 18 insertions(+), 2 deletions(-) diff --git a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs index 02f85c8e..dac04677 100644 --- a/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs @@ -58,6 +58,7 @@ namespace v2rayN.ViewModels SaveServer(); }); + Utils.SetDarkBorder(view, _config.uiItem.colorModeDark); } private void SaveServer() diff --git a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs index 9e83e972..d27c7db4 100644 --- a/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/AddServerViewModel.cs @@ -46,6 +46,7 @@ namespace v2rayN.ViewModels SaveServer(); }); + Utils.SetDarkBorder(view, _config.uiItem.colorModeDark); } private void SaveServer() diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs index 2cddaa85..da1f85f2 100644 --- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs @@ -161,6 +161,8 @@ namespace v2rayN.ViewModels { SaveSetting(); }); + + Utils.SetDarkBorder(view, _config.uiItem.colorModeDark); } private void InitCoreType() diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs index 54d4534b..52c09e2a 100644 --- a/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs @@ -61,6 +61,7 @@ namespace v2rayN.ViewModels SaveRules(); }); + Utils.SetDarkBorder(view, _config.uiItem.colorModeDark); } private void SaveRules() { diff --git a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs index 3e131509..9766b3cd 100644 --- a/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs @@ -115,6 +115,8 @@ namespace v2rayN.ViewModels { SaveRouting(); }); + + Utils.SetDarkBorder(view, _config.uiItem.colorModeDark); } public void RefreshRulesItems() diff --git a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs index 1c59d399..884c6760 100644 --- a/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs @@ -113,6 +113,8 @@ namespace v2rayN.ViewModels { SaveRouting(); }); + + Utils.SetDarkBorder(view, _config.uiItem.colorModeDark); } #region locked diff --git a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs index d9c3f233..b72f61f6 100644 --- a/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/SubEditViewModel.cs @@ -41,6 +41,8 @@ namespace v2rayN.ViewModels { SaveSub(); }); + + Utils.SetDarkBorder(view, _config.uiItem.colorModeDark); } private void SaveSub() { diff --git a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs index c968693d..0df1c2f9 100644 --- a/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs @@ -5,6 +5,7 @@ using ReactiveUI; using ReactiveUI.Fody.Helpers; using Splat; using System.Reactive; +using System.Windows; using System.Windows.Forms; using v2rayN.Base; using v2rayN.Handler; @@ -30,7 +31,7 @@ namespace v2rayN.ViewModels public ReactiveCommand SubShareCmd { get; } public bool IsModified { get; set; } - public SubSettingViewModel() + public SubSettingViewModel(Window view) { _config = LazyConfig.Instance.GetConfig(); _noticeHandler = Locator.Current.GetService(); @@ -59,6 +60,8 @@ namespace v2rayN.ViewModels { SubShare(); }, canEditRemove); + + Utils.SetDarkBorder(view, _config.uiItem.colorModeDark); } public void RefreshSubItems() diff --git a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs index 7335da1c..2fd15895 100644 --- a/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs @@ -49,6 +49,8 @@ namespace v2rayN.Views txtGlobalHotkey4.KeyDown += TxtGlobalHotkey_KeyDown; BindingData(-1); + + Utils.SetDarkBorder(this, _config.uiItem.colorModeDark); } diff --git a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs index 39ce1758..8e01da40 100644 --- a/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs @@ -11,7 +11,7 @@ namespace v2rayN.Views { InitializeComponent(); - ViewModel = new SubSettingViewModel(); + ViewModel = new SubSettingViewModel(this); lstSubscription.MouseDoubleClick += LstSubscription_MouseDoubleClick; this.WhenActivated(disposables =>