Small refactorings to unify code styling

RGB.NET.Core/Positioning/Rectangle.cs

@@ -335,8 +335,7 @@ namespace RGB.NET.Core
         /// <returns><c>true</c> if <paramref name="obj" /> is a <see cref="Rectangle" /> equivalent to this <see cref="Rectangle" />; otherwise, <c>false</c>.</returns>
         public override bool Equals(object obj)
         {
-            Rectangle compareRect = obj as Rectangle;
+            if (!(obj is Rectangle compareRect))
-            if (ReferenceEquals(compareRect, null))
                 return false;
 
             if (ReferenceEquals(this, compareRect))
@@ -372,7 +371,7 @@ namespace RGB.NET.Core
         /// <param name="rectangle1">The first <see cref="Rectangle" /> to compare.</param>
         /// <param name="rectangle2">The second <see cref="Rectangle" /> to compare.</param>
         /// <returns><c>true</c> if <paramref name="rectangle1" /> and <paramref name="rectangle2" /> are equal; otherwise, <c>false</c>.</returns>
-        public static bool operator ==(Rectangle rectangle1, Rectangle rectangle2) => ReferenceEquals(rectangle1, null) ? ReferenceEquals(rectangle2, null) : rectangle1.Equals(rectangle2);
+        public static bool operator ==(Rectangle rectangle1, Rectangle rectangle2) => rectangle1?.Equals(rectangle2) ?? ReferenceEquals(rectangle2, null);
 
         /// <summary>
         /// Returns a value that indicates whether two specified <see cref="Rectangle" /> are equal.

RGB.NET.Devices.Asus/AsusDeviceProvider.cs

@@ -60,6 +60,7 @@ namespace RGB.NET.Devices.Asus
         /// <summary>
         /// Gets or sets a function to get the culture for a specific device.
         /// </summary>
+        // ReSharper disable once AutoPropertyCanBeMadeGetOnly.Global
         public Func<CultureInfo> GetCulture { get; set; } = CultureHelper.GetCurrentCulture;
 
         #endregion

RGB.NET.Devices.CoolerMaster/CoolerMasterDeviceProvider.cs

@@ -60,6 +60,7 @@ namespace RGB.NET.Devices.CoolerMaster
         /// <summary>
         /// Gets or sets a function to get the culture for a specific device.
         /// </summary>
+        // ReSharper disable once AutoPropertyCanBeMadeGetOnly.Global
         public Func<CultureInfo> GetCulture { get; set; } = CultureHelper.GetCurrentCulture;
 
         #endregion

RGB.NET.Devices.CoolerMaster/Keyboard/CoolerMasterKeyboardRGBDevice.cs

@@ -34,15 +34,15 @@ namespace RGB.NET.Devices.CoolerMaster
             if (leds.Count > 0)
             {
                 // 6 by 22 seems hard-coded but it's what the CM SDK expects regardless of keyboard size
-                _CoolerMasterSDK.COLOR_MATRIX matrix = new _CoolerMasterSDK.COLOR_MATRIX { KeyColor = new _CoolerMasterSDK.KEY_COLOR[6, 22] };
+                _CoolerMasterColorMatrix colorMatrix = new _CoolerMasterColorMatrix { KeyColor = new _CoolerMasterKeyColor[_CoolerMasterColorMatrix.ROWS, _CoolerMasterColorMatrix.COLUMNS] };
                 foreach (Led led in leds)
                 {
                     (int row, int column) = ((int, int))led.CustomData;
-                    matrix.KeyColor[row, column] = new _CoolerMasterSDK.KEY_COLOR(led.Color.R, led.Color.G, led.Color.B);
+                    colorMatrix.KeyColor[row, column] = new _CoolerMasterKeyColor(led.Color.R, led.Color.G, led.Color.B);
                 }
 
                 _CoolerMasterSDK.SetControlDevice(DeviceInfo.DeviceIndex);
-                _CoolerMasterSDK.SetAllLedColor(matrix);
+                _CoolerMasterSDK.SetAllLedColor(colorMatrix);
                 _CoolerMasterSDK.RefreshLed(false);
             }
         }

RGB.NET.Devices.CoolerMaster/Keyboard/CoolerMasterKeyboardRGBDeviceInfo.cs

@@ -15,7 +15,7 @@ namespace RGB.NET.Devices.CoolerMaster
         /// <summary>
         /// Gets the <see cref="CoolerMasterPhysicalKeyboardLayout"/> of the <see cref="CoolerMasterKeyboardRGBDevice"/>.
         /// </summary>
-        public CoolerMasterPhysicalKeyboardLayout PhysicalLayout { get; private set; }
+        public CoolerMasterPhysicalKeyboardLayout PhysicalLayout { get; }
 
         /// <summary>
         /// Gets the <see cref="CoolerMasterLogicalKeyboardLayout"/> of the <see cref="CoolerMasterKeyboardRGBDevice"/>.

RGB.NET.Devices.CoolerMaster/Native/_CoolerMasterColorMatrix.cs

@@ -0,0 +1,22 @@
+using System.Runtime.InteropServices;
+
+namespace RGB.NET.Devices.CoolerMaster.Native
+{
+    // ReSharper disable once InconsistentNaming
+    internal struct _CoolerMasterColorMatrix
+    {
+        #region Constants
+
+        internal const int ROWS = 6;
+        internal const int COLUMNS = 22;
+
+        #endregion
+
+        #region Properties & Fields
+
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = ROWS * COLUMNS)]
+        public _CoolerMasterKeyColor[,] KeyColor;
+
+        #endregion
+    }
+}

RGB.NET.Devices.CoolerMaster/Native/_CoolerMasterKeyColor.cs

@@ -0,0 +1,30 @@
+// ReSharper disable UnusedMethodReturnValue.Global
+// ReSharper disable UnusedMember.Global
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable NotAccessedField.Global
+
+namespace RGB.NET.Devices.CoolerMaster.Native
+{
+    // ReSharper disable once InconsistentNaming
+    internal struct _CoolerMasterKeyColor
+    {
+        #region Properties & Fields
+
+        public byte R;
+        public byte G;
+        public byte B;
+
+        #endregion
+
+        #region Constructors
+
+        internal _CoolerMasterKeyColor(byte r, byte g, byte b)
+        {
+            this.R = r;
+            this.G = g;
+            this.B = b;
+        }
+
+        #endregion
+    }
+}

RGB.NET.Devices.CoolerMaster/Native/_CoolerMasterSDK.cs

@@ -74,31 +74,6 @@ namespace RGB.NET.Devices.CoolerMaster.Native
 
         #region SDK-METHODS
 
-        #region Structs
-
-        // ReSharper disable InconsistentNaming
-        internal struct KEY_COLOR
-        {
-            public byte r;
-            public byte g;
-            public byte b;
-
-            public KEY_COLOR(byte colR, byte colG, byte colB)
-            {
-                r = colR;
-                g = colG;
-                b = colB;
-            }
-        }
-
-        internal struct COLOR_MATRIX
-        {
-            [MarshalAs(UnmanagedType.ByValArray, SizeConst = 132)] public KEY_COLOR[,] KeyColor;
-        }
-        // ReSharper restore InconsistentNaming
-
-        #endregion
-
         #region Pointers
 
         private static GetSDKVersionPointer _getSDKVersionPointer;
@@ -141,7 +116,7 @@ namespace RGB.NET.Devices.CoolerMaster.Native
 
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         [return: MarshalAs(UnmanagedType.I1)]
-        private delegate bool SetAllLedColorPointer(COLOR_MATRIX colorMatrix);
+        private delegate bool SetAllLedColorPointer(_CoolerMasterColorMatrix colorMatrix);
 
         #endregion
 
@@ -150,66 +125,42 @@ namespace RGB.NET.Devices.CoolerMaster.Native
         /// <summary>
         /// CM-SDK: Get SDK Dll's Version.
         /// </summary>
-        internal static int GetSDKVersion()
+        internal static int GetSDKVersion() => _getSDKVersionPointer();
-        {
-            return _getSDKVersionPointer();
-        }
 
         /// <summary>
         /// CM-SDK: set operating device
         /// </summary>
-        internal static void SetControlDevice(CoolerMasterDevicesIndexes devicesIndexes)
+        internal static void SetControlDevice(CoolerMasterDevicesIndexes devicesIndexes) => _setControlDevicenPointer(devicesIndexes);
-        {
-            _setControlDevicenPointer(devicesIndexes);
-        }
 
         /// <summary>
         /// CM-SDK: verify if the deviced is plugged in
         /// </summary>
-        internal static bool IsDevicePlugged()
+        internal static bool IsDevicePlugged() => _isDevicePlugPointer();
-        {
-            return _isDevicePlugPointer();
-        }
 
         /// <summary>
         /// CM-SDK: Obtain current device layout
         /// </summary>
-        internal static CoolerMasterPhysicalKeyboardLayout GetDeviceLayout()
+        internal static CoolerMasterPhysicalKeyboardLayout GetDeviceLayout() => _getDeviceLayoutPointer();
-        {
-            return _getDeviceLayoutPointer();
-        }
 
         /// <summary>
         /// CM-SDK: set control over device’s LED
         /// </summary>
-        internal static bool EnableLedControl(bool value)
+        internal static bool EnableLedControl(bool value) => _enableLedControlPointer(value);
-        {
-            return _enableLedControlPointer(value);
-        }
 
         /// <summary>
         /// CM-SDK: Print out the lights setting from Buffer to LED
         /// </summary>
-        internal static bool RefreshLed(bool autoRefresh)
+        internal static bool RefreshLed(bool autoRefresh) => _refreshLedPointer(autoRefresh);
-        {
-            return _refreshLedPointer(autoRefresh);
-        }
 
         /// <summary>
         /// CM-SDK: Set single Key LED color
         /// </summary>
-        internal static bool SetLedColor(int row, int column, byte r, byte g, byte b)
+        internal static bool SetLedColor(int row, int column, byte r, byte g, byte b) => _setLedColorPointer(row, column, r, g, b);
-        {
-            return _setLedColorPointer(row, column, r, g, b);
-        }
 
         /// <summary>
         /// CM-SDK: Set Keyboard "every LED" color
         /// </summary>
-        internal static bool SetAllLedColor(COLOR_MATRIX colorMatrix)
+        internal static bool SetAllLedColor(_CoolerMasterColorMatrix colorMatrix) => _setAllLedColorPointer(colorMatrix);
-        {
-            return _setAllLedColorPointer(colorMatrix);
-        }
 
         // ReSharper restore EventExceptionNotDocumented
 

RGB.NET.Devices.CoolerMaster/RGB.NET.Devices.CoolerMaster.csproj

@@ -60,7 +60,9 @@
     <Compile Include="Keyboard\CoolerMasterKeyboardRGBDeviceInfo.cs" />
     <Compile Include="Keyboard\CoolerMasterKeyboardLedMappings.cs" />
     <Compile Include="Mouse\CoolerMasterMouseLedMappings.cs" />
+    <Compile Include="Native\_CoolerMasterColorMatrix.cs" />
     <Compile Include="Native\_CoolerMasterSDK.cs" />
+    <Compile Include="Native\_CoolerMasterKeyColor.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

RGB.NET.Devices.Logitech/Native/_LogitechGSDK.cs

@@ -125,20 +125,11 @@ namespace RGB.NET.Devices.Logitech.Native
 
         // ReSharper disable EventExceptionNotDocumented
 
-        internal static bool LogiLedInit()
+        internal static bool LogiLedInit() => _logiLedInitPointer();
-        {
-            return _logiLedInitPointer();
-        }
 
-        internal static void LogiLedShutdown()
+        internal static void LogiLedShutdown() => _logiLedShutdownPointer();
-        {
-            _logiLedShutdownPointer();
-        }
 
-        internal static bool LogiLedSetTargetDevice(LogitechDeviceCaps targetDevice)
+        internal static bool LogiLedSetTargetDevice(LogitechDeviceCaps targetDevice) => _logiLedSetTargetDevicePointer((int)targetDevice);
-        {
-            return _logiLedSetTargetDevicePointer((int)targetDevice);
-        }
 
         internal static string LogiLedGetSdkVersion()
         {
@@ -150,36 +141,18 @@ namespace RGB.NET.Devices.Logitech.Native
             return $"{major}.{minor}.{build}";
         }
 
-        internal static bool LogiLedGetSdkVersion(ref int majorNum, ref int minorNum, ref int buildNum)
+        internal static bool LogiLedGetSdkVersion(ref int majorNum, ref int minorNum, ref int buildNum) => _logiLedGetSdkVersionPointer(ref majorNum, ref minorNum, ref buildNum);
-        {
-            return _logiLedGetSdkVersionPointer(ref majorNum, ref minorNum, ref buildNum);
-        }
 
-        internal static bool LogiLedSaveCurrentLighting()
+        internal static bool LogiLedSaveCurrentLighting() => _lgiLedSaveCurrentLightingPointer();
-        {
-            return _lgiLedSaveCurrentLightingPointer();
-        }
 
-        internal static bool LogiLedRestoreLighting()
+        internal static bool LogiLedRestoreLighting() => _logiLedRestoreLightingPointer();
-        {
-            return _logiLedRestoreLightingPointer();
-        }
 
-        internal static bool LogiLedSetLighting(int redPercentage, int greenPercentage, int bluePercentage)
+        internal static bool LogiLedSetLighting(int redPercentage, int greenPercentage, int bluePercentage) => _logiLedSetLightingPointer(redPercentage, greenPercentage, bluePercentage);
-        {
-            return _logiLedSetLightingPointer(redPercentage, greenPercentage, bluePercentage);
-        }
 
         internal static bool LogiLedSetLightingForKeyWithKeyName(int keyCode,
-            int redPercentage, int greenPercentage, int bluePercentage)
+            int redPercentage, int greenPercentage, int bluePercentage) => _logiLedSetLightingForKeyWithKeyNamePointer(keyCode, redPercentage, greenPercentage, bluePercentage);
-        {
-            return _logiLedSetLightingForKeyWithKeyNamePointer(keyCode, redPercentage, greenPercentage, bluePercentage);
-        }
 
-        internal static bool LogiLedSetLightingFromBitmap(byte[] bitmap)
+        internal static bool LogiLedSetLightingFromBitmap(byte[] bitmap) => _logiLedSetLightingFromBitmapPointer(bitmap);
-        {
-            return _logiLedSetLightingFromBitmapPointer(bitmap);
-        }
 
         // ReSharper restore EventExceptionNotDocumented