Windows fixes

Author: macmade

ColorSet.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.572
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29025.244
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorSetKit", "ColorSetKit\ColorSetKit.csproj", "{E3BF32CB-99E2-4331-AFB6-9281D79E63BC}"
 EndProject

ColorSetKit/Color.cs

@@ -81,13 +81,13 @@ public override object ProvideValue( IServiceProvider provider )
         {
             NameComponents components = this.ComponentsForColorName( this.Name );
 
-            if( !( ColorSet.Shared.ColorNamed( this.Name ) is ColorPair pair ) )
+            if( !( ColorSet.Shared.ColorNamed( components.Name ) is ColorPair pair ) )
             {
                 return this.Fallback;
             }
 
-            ColorExtension.HSLComponents hsl       = pair.Color?.Color.GetHSL() ?? new ColorExtension.HSLComponents { Hue = 0, Saturation = 0, Lightness = 0, Alpha = 0 };
-            double?                      lightness = components.Lightness;
+            ColorExtensions.HSLComponents hsl       = pair.Color?.Color.GetHSL() ?? new ColorExtensions.HSLComponents { Hue = 0, Saturation = 0, Lightness = 0, Alpha = 0 };
+            double?                       lightness = components.Lightness;
 
             if( components.Variant is string v )
             {
@@ -139,7 +139,7 @@ public override object ProvideValue( IServiceProvider provider )
                     }
                 }
 
-                return ( pair.Color == null ) ? null : new SolidColorBrush( pair.Color.Color.ByChangingLightness( l ) );
+                return ( pair.Color == null ) ? this.Fallback : new SolidColorBrush( pair.Color.Color.ByChangingLightness( l ) );
             }
 
             if( this.Variant && pair.Variant is SolidColorBrush variant )
@@ -156,7 +156,7 @@ public string Name
             get;
             set;
         }
-
+        
         [ConstructorArgument( "variant" )]
         public bool Variant
         {

ColorSetKit/ColorExtension.cs ColorSetKit/ColorExtensions.csColorSetKit/ColorExtension.cs renamed to ColorSetKit/ColorExtensions.cs

@@ -29,7 +29,7 @@
 
 namespace ColorSetKit
 {
-    public static class ColorExtension
+    public static class ColorExtensions
     {
         private struct HSL
         {
@@ -70,7 +70,7 @@ public static System.Windows.Media.Color FromHSL( double hue, double saturation,
                 R = ( byte )( Math.Floor( rgb.Red   * 255 ) ),
                 G = ( byte )( Math.Floor( rgb.Green * 255 ) ),
                 B = ( byte )( Math.Floor( rgb.Blue  * 255 ) ),
-                A = ( byte )( Math.Floor( alpha     * 255 ) )
+                A = ( byte )( Math.Floor( alpha     * 100 ) )
             };
         }
 

ColorSetKit/ColorSetKit.csproj

@@ -45,7 +45,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Color.cs" />
-    <Compile Include="ColorExtension.cs" />
+    <Compile Include="ColorExtensions.cs" />
     <Compile Include="ColorPair.cs" />
     <Compile Include="ColorSet.cs" />
     <Compile Include="ColorSetStream.cs" />