Merge pull request #157 from DarthAffe/Development

Merge development to master

Author: DarthAffe

README.md

@@ -12,6 +12,10 @@ This is the easiest and therefore preferred way to include RGB.NET in your proje
 Since there aren't any release-packages right now you'll have to use the CI-feed from [http://nuget.arge.be](http://nuget.arge.be).   
 You can include it either by adding ```http://nuget.arge.be/v3/index.json``` to your Visual Studio package sources or by adding this [NuGet.Config](https://github.com/DarthAffe/RGB.NET/tree/master/Documentation/NuGet.Config) to your project (at the same level as your solution). 
 
+### .NET 4.5 Support ###
+At the end of the year with the release of .NET 5 the support for old .NET-Framwork versions will be droppped!   
+It's not recommended to use RGB.NET in projects targeting .NET 4.x that aren't planned to be moved to Core/.NET 5 in the future.
+
 
 ### Device-Layouts
 To be able to have devices with correct LED-locations and sizes they need to be layouted. Pre-created layouts can be found at https://github.com/DarthAffe/RGB.NET-Resources.   

RGB.NET.Brushes/RGB.NET.Brushes.csproj

@@ -14,8 +14,8 @@
     <RootNamespace>RGB.NET.Brushes</RootNamespace>
     <Description>Brushes-Presets of RGB.NET</Description>
     <Summary>Brushes-Presets of RGB.NET, a C# (.NET) library for accessing various RGB-peripherals</Summary>
-    <Copyright>Copyright © Wyrez 2017</Copyright>
-    <PackageCopyright>Copyright © Wyrez 2017</PackageCopyright>
+    <Copyright>Copyright © Darth Affe 2020</Copyright>
+    <PackageCopyright>Copyright © Darth Affe 2020</PackageCopyright>
     <PackageIconUrl>http://lib.arge.be/icon.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/DarthAffe/RGB.NET</PackageProjectUrl>
     <PackageLicenseUrl>https://raw.githubusercontent.com/DarthAffe/RGB.NET/master/LICENSE</PackageLicenseUrl>
@@ -63,6 +63,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 </Project>

RGB.NET.Core/Brushes/AbstractBrush.cs

@@ -110,14 +110,20 @@ public virtual void PerformFinalize()
         /// <returns>The finalized color.</returns>
         protected virtual Color FinalizeColor(Color color)
         {
-            foreach (IColorCorrection colorCorrection in ColorCorrections)
-                color = colorCorrection.ApplyTo(color);
+            if (ColorCorrections.Count > 0)
+                foreach (IColorCorrection colorCorrection in ColorCorrections)
+                    color = colorCorrection.ApplyTo(color);
 
             // Since we use HSV to calculate there is no way to make a color 'brighter' than 100%
             // Be carefull with the naming: Since we use HSV the correct term is 'value' but outside we call it 'brightness'
             // THIS IS NOT A HSB CALCULATION!!!
-            return color.MultiplyHSV(value: Brightness.Clamp(0, 1))
-                        .MultiplyA(Opacity.Clamp(0, 1));
+            if (Brightness < 1)
+                color = color.MultiplyHSV(value: Brightness.Clamp(0, 1));
+
+            if (Opacity < 1)
+                color = color.MultiplyA(Opacity.Clamp(0, 1));
+
+            return color;
         }
 
         #endregion

RGB.NET.Core/Decorators/AbstractDecorateable.cs

@@ -12,18 +12,15 @@ public abstract class AbstractDecoratable<T> : AbstractBindable, IDecoratable<T>
         #region Properties & Fields
 
         private readonly List<T> _decorators = new List<T>();
-        /// <summary>
-        /// Gets a readonly-list of all <see cref="IDecorator"/> attached to this <see cref="IDecoratable{T}"/>.
-        /// </summary>
-        protected IReadOnlyCollection<T> Decorators { get; }
 
-        #endregion
-
-        #region Constructors
-
-        protected AbstractDecoratable()
+        /// <inheritdoc />
+        public IReadOnlyCollection<T> Decorators
         {
-            Decorators = new ReadOnlyCollection<T>(_decorators);
+            get
+            {
+                lock (_decorators)
+                    return new ReadOnlyCollection<T>(_decorators);
+            }
         }
 
         #endregion

RGB.NET.Core/Decorators/AbstractDecorator.cs

@@ -1,4 +1,6 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace RGB.NET.Core
 {
@@ -42,16 +44,17 @@ public int Order
         /// <summary>
         /// Detaches the decorator from all <see cref="IDecoratable"/> it is currently attached to.
         /// </summary>
-        /// <typeparam name="TDecoratable">The type of the <see cref="IDecoratable"/> this decorator is attached to.</typeparam>
-        /// <typeparam name="TDecorator">The type of this <see cref="IDecorator"/>.</typeparam>
-        protected virtual void Detach<TDecoratable, TDecorator>()
-            where TDecoratable : IDecoratable<TDecorator>
-            where TDecorator : AbstractDecorator
+        protected virtual void Detach()
         {
             List<IDecoratable> decoratables = new List<IDecoratable>(DecoratedObjects);
             foreach (IDecoratable decoratable in decoratables)
-                if (decoratable is TDecoratable typedDecoratable)
-                    typedDecoratable.RemoveDecorator((TDecorator)this);
+            {
+                IEnumerable<Type> types = decoratable.GetType().GetInterfaces().Where(t => t.IsGenericType
+                                                                                        && (t.Name == typeof(IDecoratable<>).Name)
+                                                                                        && t.GenericTypeArguments[0].IsInstanceOfType(this));
+                foreach (Type decoratableType in types)
+                    decoratableType.GetMethod(nameof(IDecoratable<IDecorator>.RemoveDecorator))?.Invoke(decoratable, new object[] { this });
+            }
         }
 
         #endregion

RGB.NET.Core/Decorators/IDecoratable.cs

@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using System.Collections.Generic;
+using System.ComponentModel;
 
 namespace RGB.NET.Core
 {
@@ -13,9 +14,14 @@ public interface IDecoratable : INotifyPropertyChanged
     /// Represents a basic decoratable for a specific type of <see cref="T:RGB.NET.Core.IDecorator" />
     /// </summary>
     /// <typeparam name="T"></typeparam>
-    public interface IDecoratable<in T> : IDecoratable
+    public interface IDecoratable<T> : IDecoratable
         where T : IDecorator
     {
+        /// <summary>
+        /// Gets a readonly-list of all <see cref="IDecorator"/> attached to this <see cref="IDecoratable{T}"/>.
+        /// </summary>
+        IReadOnlyCollection<T> Decorators { get; }
+
         /// <summary>
         /// Adds an <see cref="IDecorator"/> to the <see cref="IDecoratable"/>.
         /// </summary>

RGB.NET.Core/Devices/AbstractRGBDevice.cs

@@ -157,8 +157,12 @@ public virtual void SyncBack()
         /// <inheritdoc />
         public virtual void Dispose()
         {
-            SpecialDeviceParts.Clear();
-            LedMapping.Clear();
+            try
+            {
+                SpecialDeviceParts.Clear();
+                LedMapping.Clear();
+            }
+            catch { /* this really shouldn't happen */ }
         }
 
         /// <summary>

RGB.NET.Core/Devices/TypeInterfaces/ICooler.cs

@@ -0,0 +1,8 @@
+namespace RGB.NET.Core
+{
+    /// <summary>
+    /// Represents a cooler-device
+    /// </summary>
+    public interface ICooler : IRGBDevice
+    { }
+}

RGB.NET.Core/Devices/TypeInterfaces/IDRAM.cs

@@ -0,0 +1,8 @@
+namespace RGB.NET.Core
+{
+    /// <summary>
+    /// Represents a DRAM-device
+    /// </summary>
+    public interface IDRAM : IRGBDevice
+    { }
+}

RGB.NET.Core/Devices/TypeInterfaces/IFan.cs

@@ -0,0 +1,8 @@
+namespace RGB.NET.Core
+{
+    /// <summary>
+    /// represents a fan-device
+    /// </summary>
+    public interface IFan : IRGBDevice
+    { }
+}