diff --git a/Convs/AboutVersionButtonContentConv.cs b/Convs/AboutVersionButtonContentConv.cs index 48accc2..7fafd8b 100644 --- a/Convs/AboutVersionButtonContentConv.cs +++ b/Convs/AboutVersionButtonContentConv.cs @@ -8,8 +8,8 @@ internal class AboutVersionButtonContentConv : IMultiValueConverter { public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { - string? versionButtonLabelContent = values[0] as string; - string? versionButtonVersionContent = values[1] as string; + string versionButtonLabelContent = (string)values[0]; + string versionButtonVersionContent = (string)values[1]; return $"{versionButtonLabelContent} {versionButtonVersionContent}"; } diff --git a/Convs/MainSettingsBoxHintConv.cs b/Convs/MainSettingsBoxHintConv.cs index 8b077e7..0a22e16 100644 --- a/Convs/MainSettingsBoxHintConv.cs +++ b/Convs/MainSettingsBoxHintConv.cs @@ -10,7 +10,7 @@ internal class MainSettingsBoxHintConv : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - MainConst.SettingsMode? settingsMode = value as MainConst.SettingsMode?; + MainConst.SettingsMode settingsMode = (MainConst.SettingsMode)value; return settingsMode switch { diff --git a/Convs/MainSettingsBoxTextConv.cs b/Convs/MainSettingsBoxTextConv.cs index 048889f..a93f752 100644 --- a/Convs/MainSettingsBoxTextConv.cs +++ b/Convs/MainSettingsBoxTextConv.cs @@ -9,16 +9,16 @@ internal class MainSettingsBoxTextConv : IMultiValueConverter { public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture) { - MainConst.SettingsMode? settingsMode = values[0] as MainConst.SettingsMode?; - string? browserPath = values[1] as string; - string? upstreamUrl = values[2] as string; - string? extraArgs = values[3] as string; + MainConst.SettingsMode settingsMode = (MainConst.SettingsMode)values[0]; + string browserPath = (string)values[1]; + string upstreamUrl = (string)values[2]; + string extraArgs = (string)values[3]; return settingsMode switch { - MainConst.SettingsMode.BrowserPathMode => browserPath!, - MainConst.SettingsMode.UpstreamUrlMode => upstreamUrl!, - MainConst.SettingsMode.ExtraArgsMode => extraArgs!, + MainConst.SettingsMode.BrowserPathMode => browserPath, + MainConst.SettingsMode.UpstreamUrlMode => upstreamUrl, + MainConst.SettingsMode.ExtraArgsMode => extraArgs, _ => throw new UnreachableException(), }; } diff --git a/Convs/MainSettingsBoxToolTipConv.cs b/Convs/MainSettingsBoxToolTipConv.cs index c17470f..fbe3f9d 100644 --- a/Convs/MainSettingsBoxToolTipConv.cs +++ b/Convs/MainSettingsBoxToolTipConv.cs @@ -10,7 +10,7 @@ internal class MainSettingsBoxToolTipConv : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - MainConst.SettingsMode? settingsMode = value as MainConst.SettingsMode?; + MainConst.SettingsMode settingsMode = (MainConst.SettingsMode)value; return settingsMode switch { diff --git a/Convs/MainSettingsFunctionButtonContentConv.cs b/Convs/MainSettingsFunctionButtonContentConv.cs index 370d75c..a1e0067 100644 --- a/Convs/MainSettingsFunctionButtonContentConv.cs +++ b/Convs/MainSettingsFunctionButtonContentConv.cs @@ -10,7 +10,7 @@ internal class MainSettingsFunctionButtonContentConv : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - MainConst.SettingsMode? settingsMode = value as MainConst.SettingsMode?; + MainConst.SettingsMode settingsMode = (MainConst.SettingsMode)value; return settingsMode switch { diff --git a/Convs/MainSettingsModeButtonContentConv.cs b/Convs/MainSettingsModeButtonContentConv.cs index 7ecedcd..d48d91d 100644 --- a/Convs/MainSettingsModeButtonContentConv.cs +++ b/Convs/MainSettingsModeButtonContentConv.cs @@ -9,7 +9,7 @@ internal class MainSettingsModeButtonContentConv : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - MainConst.SettingsMode? settingsMode = value as MainConst.SettingsMode?; + MainConst.SettingsMode settingsMode = (MainConst.SettingsMode)value; return settingsMode switch { diff --git a/Convs/MainStartButtonIsEnabledConv.cs b/Convs/MainStartButtonIsEnabledConv.cs index 9449258..bf06a4a 100644 --- a/Convs/MainStartButtonIsEnabledConv.cs +++ b/Convs/MainStartButtonIsEnabledConv.cs @@ -10,10 +10,10 @@ internal class MainStartButtonIsEnabledConv : IMultiValueConverter { public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { - string? browserPath = values[0] as string; - string? extraArgs = values[1] as string; + string browserPath = (string)values[0]; + string extraArgs = (string)values[1]; - return File.Exists(browserPath) && Path.GetFileName(browserPath).ToLowerInvariant().EndsWith(".exe") && MainConst.ExtraArgsRegex().IsMatch(extraArgs!); + return File.Exists(browserPath) && Path.GetFileName(browserPath).ToLowerInvariant().EndsWith(".exe") && MainConst.ExtraArgsRegex().IsMatch(extraArgs); } public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException(); diff --git a/Convs/MainUpdateHostButtonIsEnabledConv.cs b/Convs/MainUpdateHostButtonIsEnabledConv.cs index 367304f..7d316e9 100644 --- a/Convs/MainUpdateHostButtonIsEnabledConv.cs +++ b/Convs/MainUpdateHostButtonIsEnabledConv.cs @@ -9,9 +9,9 @@ internal class MainUpdateHostButtonIsEnabledConv : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - string? upstreamUrl = value as string; + string upstreamUrl = (string)value; - return MainConst.UpstreamUrlRegex().IsMatch(upstreamUrl!); + return MainConst.UpstreamUrlRegex().IsMatch(upstreamUrl); } public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException(); diff --git a/Utils/BorderThemeSetter.cs b/Utils/BorderThemeSetter.cs index 80d7bdf..9ccfac9 100644 --- a/Utils/BorderThemeSetter.cs +++ b/Utils/BorderThemeSetter.cs @@ -6,8 +6,8 @@ namespace Sheas_Cealer.Utils; internal static partial class BorderThemeSetter { - private const int DWMWA_USE_IMMERSIVE_DARK_MODE_OLD = 19; - private const int DWMWA_USE_IMMERSIVE_DARK_MODE = 20; + private const int DwmwaUseImmersiveDarkModeOld = 19; + private const int DwmwaUseImmersiveDarkMode = 20; [LibraryImport("dwmapi.dll")] private static partial int DwmGetWindowAttribute(nint hwnd, uint attr, out nint attrValue, uint attrSize); @@ -23,9 +23,9 @@ internal static partial class BorderThemeSetter if (isLightTheme.HasValue) isDarkTheme = !isLightTheme.Value ? 1 : 0; else - DwmGetWindowAttribute(desktopHwnd, DWMWA_USE_IMMERSIVE_DARK_MODE, out isDarkTheme, (uint)Marshal.SizeOf(typeof(nint))); + DwmGetWindowAttribute(desktopHwnd, DwmwaUseImmersiveDarkMode, out isDarkTheme, (uint)Marshal.SizeOf(typeof(nint))); - _ = DwmSetWindowAttribute(windowHwnd, DWMWA_USE_IMMERSIVE_DARK_MODE_OLD, ref isDarkTheme, (uint)Marshal.SizeOf(typeof(nint))); - _ = DwmSetWindowAttribute(windowHwnd, DWMWA_USE_IMMERSIVE_DARK_MODE, ref isDarkTheme, (uint)Marshal.SizeOf(typeof(nint))); + _ = DwmSetWindowAttribute(windowHwnd, DwmwaUseImmersiveDarkModeOld, ref isDarkTheme, (uint)Marshal.SizeOf(typeof(nint))); + _ = DwmSetWindowAttribute(windowHwnd, DwmwaUseImmersiveDarkMode, ref isDarkTheme, (uint)Marshal.SizeOf(typeof(nint))); } } \ No newline at end of file diff --git a/Utils/IconRemover.cs b/Utils/IconRemover.cs index 75588a2..e31510f 100644 --- a/Utils/IconRemover.cs +++ b/Utils/IconRemover.cs @@ -6,13 +6,13 @@ namespace Sheas_Cealer.Utils; internal static partial class IconRemover { - private const int GWL_EXSTYLE = -20; - private const int WS_EX_DLGMODALFRAME = 0x0001; - private const int SWP_NOSIZE = 0x0001; - private const int SWP_NOMOVE = 0x0002; - private const int SWP_NOZORDER = 0x0004; - private const int SWP_FRAMECHANGED = 0x0020; - private const uint WM_SETICON = 0x0080; + private const int GwlExStyle = -20; + private const int WsExDlgModalFrame = 0x0001; + private const int SwpNoSize = 0x0001; + private const int SwpNoMove = 0x0002; + private const int SwpNoZOrder = 0x0004; + private const int SwpFrameChanged = 0x0020; + private const uint WmSetIcon = 0x0080; [LibraryImport("user32.dll", EntryPoint = "GetWindowLongW")] private static partial int GetWindowLong(nint hwnd, int index); @@ -28,11 +28,11 @@ internal static partial class IconRemover { nint hwnd = new WindowInteropHelper(window).Handle; - _ = SetWindowLong(hwnd, GWL_EXSTYLE, GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_DLGMODALFRAME); + _ = SetWindowLong(hwnd, GwlExStyle, GetWindowLong(hwnd, GwlExStyle) | WsExDlgModalFrame); - SetWindowPos(hwnd, nint.Zero, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED); + SetWindowPos(hwnd, nint.Zero, 0, 0, 0, 0, SwpNoMove | SwpNoSize | SwpNoZOrder | SwpFrameChanged); - SendMessage(hwnd, WM_SETICON, new nint(1), nint.Zero); - SendMessage(hwnd, WM_SETICON, nint.Zero, nint.Zero); + SendMessage(hwnd, WmSetIcon, new nint(1), nint.Zero); + SendMessage(hwnd, WmSetIcon, nint.Zero, nint.Zero); } } \ No newline at end of file diff --git a/Wins/AboutWin.xaml b/Wins/AboutWin.xaml index 1013151..4591992 100644 --- a/Wins/AboutWin.xaml +++ b/Wins/AboutWin.xaml @@ -20,10 +20,10 @@ - -