From 9a75cbd8e796f3f7271dd8a9dc1cf9118fb32616 Mon Sep 17 00:00:00 2001 From: Stone_Red <56473591+Stone-Red-Code@users.noreply.github.com> Date: Thu, 22 Feb 2024 09:34:01 +0100 Subject: [PATCH] Fix or disable multiple warnings --- src/DesktopMagic/Helpers/Win32Wrapper.cs | 2 +- src/DesktopMagic/Helpers/WindowPos.cs | 2 +- src/DesktopMagic/Plugins/PluginWindow.xaml.cs | 2 +- src/DesktopMagicPluginAPI/Drawing/FontComparer.cs | 7 ++++++- src/DesktopMagicPluginAPI/Settings/Button.cs | 4 ++-- src/DesktopMagicPluginAPI/Settings/Label.cs | 2 +- src/DesktopMagicPluginAPI/Settings/TextBox.cs | 2 +- 7 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/DesktopMagic/Helpers/Win32Wrapper.cs b/src/DesktopMagic/Helpers/Win32Wrapper.cs index be79580..6c46996 100644 --- a/src/DesktopMagic/Helpers/Win32Wrapper.cs +++ b/src/DesktopMagic/Helpers/Win32Wrapper.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; using System.Text; - +#pragma warning disable namespace DesktopMagic.Helpers; internal class W32 diff --git a/src/DesktopMagic/Helpers/WindowPos.cs b/src/DesktopMagic/Helpers/WindowPos.cs index 29e233d..95e67ff 100644 --- a/src/DesktopMagic/Helpers/WindowPos.cs +++ b/src/DesktopMagic/Helpers/WindowPos.cs @@ -3,7 +3,7 @@ using System.Runtime.InteropServices; using System.Windows; using System.Windows.Interop; using System.Windows.Shapes; - +#pragma warning disable namespace DesktopMagic { using static NativeMethods; diff --git a/src/DesktopMagic/Plugins/PluginWindow.xaml.cs b/src/DesktopMagic/Plugins/PluginWindow.xaml.cs index 545b7ac..1c810b9 100644 --- a/src/DesktopMagic/Plugins/PluginWindow.xaml.cs +++ b/src/DesktopMagic/Plugins/PluginWindow.xaml.cs @@ -35,7 +35,7 @@ public partial class PluginWindow : Window public bool IsRunning { get; private set; } = true; public PluginMetadata PluginMetadata { get; private set; } - public string? PluginFolderPath { get; private set; } + public string PluginFolderPath { get; private set; } public PluginWindow(PluginMetadata pluginMetadata, PluginSettings settings, string pluginFolderPath) { diff --git a/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs b/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs index e39cd45..45a5171 100644 --- a/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs +++ b/src/DesktopMagicPluginAPI/Drawing/FontComparer.cs @@ -6,8 +6,13 @@ namespace DesktopMagic.Api.Drawing; internal class FontComparer : IEqualityComparer { - public bool Equals(Font font1, Font font2) + public bool Equals(Font? font1, Font? font2) { + if (font1 is null || font2 is null) + { + return false; + } + if (font1.Name != font2.Name) { return false; diff --git a/src/DesktopMagicPluginAPI/Settings/Button.cs b/src/DesktopMagicPluginAPI/Settings/Button.cs index f0393be..a2297cc 100644 --- a/src/DesktopMagicPluginAPI/Settings/Button.cs +++ b/src/DesktopMagicPluginAPI/Settings/Button.cs @@ -10,9 +10,9 @@ public class Button : Setting /// /// Occurs when the button gets clicked. /// - public event Action OnClick; + public event Action? OnClick; - private string _value; + private string _value = string.Empty; /// /// Gets or sets the text caption displayed in the element. diff --git a/src/DesktopMagicPluginAPI/Settings/Label.cs b/src/DesktopMagicPluginAPI/Settings/Label.cs index 179ce98..0547c9b 100644 --- a/src/DesktopMagicPluginAPI/Settings/Label.cs +++ b/src/DesktopMagicPluginAPI/Settings/Label.cs @@ -5,7 +5,7 @@ /// public class Label : Setting { - private string _value; + private string _value = string.Empty; /// /// Gets or sets the text associated with this . diff --git a/src/DesktopMagicPluginAPI/Settings/TextBox.cs b/src/DesktopMagicPluginAPI/Settings/TextBox.cs index a4bea95..f82eb63 100644 --- a/src/DesktopMagicPluginAPI/Settings/TextBox.cs +++ b/src/DesktopMagicPluginAPI/Settings/TextBox.cs @@ -5,7 +5,7 @@ /// public class TextBox : Setting { - private string _value; + private string _value = string.Empty; /// /// Gets or sets the text associated with this .