diff --git a/Wins/AboutWin.xaml b/Wins/AboutWin.xaml index 4e6cc30..22a1f8f 100644 --- a/Wins/AboutWin.xaml +++ b/Wins/AboutWin.xaml @@ -10,7 +10,7 @@ WindowStartupLocation="CenterScreen" ResizeMode="NoResize" SizeToContent="Height" Width="500" d:DataContext="{d:DesignInstance preses:AboutPres}" Style="{DynamicResource CommonWindow}" - Loaded="AboutWin_Loaded" KeyDown="AboutWin_KeyDown"> + SourceInitialized="AboutWin_SourceInitialized" Loaded="AboutWin_Loaded" KeyDown="AboutWin_KeyDown"> diff --git a/Wins/AboutWin.xaml.cs b/Wins/AboutWin.xaml.cs index 9782bc7..5307563 100644 --- a/Wins/AboutWin.xaml.cs +++ b/Wins/AboutWin.xaml.cs @@ -24,7 +24,7 @@ public partial class AboutWin : Window DataContext = AboutPres = new(); } - protected override void OnSourceInitialized(EventArgs e) + private void AboutWin_SourceInitialized(object sender, EventArgs e) { IconRemover.RemoveIcon(this); BorderThemeSetter.SetBorderTheme(this, AboutPres.IsLightTheme); diff --git a/Wins/MainWin.xaml b/Wins/MainWin.xaml index 8e97fab..18fdf82 100644 --- a/Wins/MainWin.xaml +++ b/Wins/MainWin.xaml @@ -13,7 +13,7 @@ d:DataContext="{d:DesignInstance preses:MainPres}" Style="{DynamicResource CommonWindow}" Width="{Binding Source={x:Static consts:MainConst.IsAdmin}, Converter={x:Static convs:MainConv.MainWinWidthConv}}" - Loaded="MainWin_Loaded" Closing="MainWin_Closing" DragEnter="MainWin_DragEnter" Drop="MainWin_Drop" KeyDown="MainWin_KeyDown"> + SourceInitialized="MainWin_SourceInitialized" Loaded="MainWin_Loaded" Closing="MainWin_Closing" DragEnter="MainWin_DragEnter" Drop="MainWin_Drop" KeyDown="MainWin_KeyDown"> diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs index b7242e1..0d1c7f8 100644 --- a/Wins/MainWin.xaml.cs +++ b/Wins/MainWin.xaml.cs @@ -61,7 +61,7 @@ public partial class MainWin : Window DataContext = MainPres = new(args); } - protected override void OnSourceInitialized(EventArgs e) + private void MainWin_SourceInitialized(object sender, EventArgs e) { IconRemover.RemoveIcon(this); BorderThemeSetter.SetBorderTheme(this, MainPres.IsLightTheme); diff --git a/Wins/SettingsWin.xaml b/Wins/SettingsWin.xaml index aac26e5..65dbed8 100644 --- a/Wins/SettingsWin.xaml +++ b/Wins/SettingsWin.xaml @@ -10,7 +10,7 @@ WindowStartupLocation="CenterScreen" ResizeMode="NoResize" SizeToContent="Height" Width="500" d:DataContext="{d:DesignInstance preses:SettingsPres}" Style="{DynamicResource CommonWindow}" - KeyDown="SettingsWin_KeyDown"> + SourceInitialized="SettingsWin_SourceInitialized" KeyDown="SettingsWin_KeyDown"> diff --git a/Wins/SettingsWin.xaml.cs b/Wins/SettingsWin.xaml.cs index 982420f..c0fdbcc 100644 --- a/Wins/SettingsWin.xaml.cs +++ b/Wins/SettingsWin.xaml.cs @@ -21,7 +21,7 @@ public partial class SettingsWin : Window DataContext = SettingsPres = new(); } - protected override void OnSourceInitialized(EventArgs e) + private void SettingsWin_SourceInitialized(object sender, EventArgs e) { IconRemover.RemoveIcon(this); BorderThemeSetter.SetBorderTheme(this, SettingsPres.IsLightTheme);