move implicit converstion of fill from and to color into Fill class, solid color...

diff --git a/src/Colors.cs b/src/Colors.cs
index f55c4187e6d7538d7c5b80c5b18784bde0fcc638..66d2613ab5d3ec08361af6c3dfcf4d68cc90e9d9 100644 (file)
--- a/src/Colors.cs
+++ b/src/Colors.cs
@@ -83,9 +83,6 @@ namespace Crow
 //             {
 //                     return new Color (v.X, v.Y, v.Z, v.W);
 //             }
-               public static implicit operator Fill(Color c){
-                       return new SolidColor (c) as Fill;
-               }
 
 
                public static bool operator ==(Color left, Color right)

diff --git a/src/Fill/Fill.cs b/src/Fill/Fill.cs
index 322fa5aef6e0743599bc4e345237d397f2c7dd35..1f45541993da6292dcee3525c9832f462c4363a4 100644 (file)
--- a/src/Fill/Fill.cs
+++ b/src/Fill/Fill.cs
@@ -22,7 +22,10 @@ namespace Crow
                        
                        return (SolidColor)SolidColor.Parse (s);
                }
-
+               public static implicit operator Color(Fill c){
+                       SolidColor sc = c as SolidColor;
+                       return sc == null ? default(Color) : sc.color;
+               }
                public static implicit operator Fill(Color c){
                        return new SolidColor (c);
                }

diff --git a/src/SolidColor.cs b/src/SolidColor.cs
index d214f592fc05311e1db5eefdf150926c63c86bfd..bbb27067c6be2a3ff7ed3d064584aecc90a0fecb 100644 (file)
--- a/src/SolidColor.cs
+++ b/src/SolidColor.cs
@@ -43,11 +43,13 @@ namespace Crow
                }
                public static bool operator ==(SolidColor left, SolidColor right)
                {
-                       return left.color == right.color ? true : false;
+                       return left is SolidColor ? right is SolidColor ? true : false :
+                               left.color == right.color ? true : false;
                }
                public static bool operator !=(SolidColor left, SolidColor right)
                {
-                       return left.color == right.color ? false : true;
+                       return left is SolidColor ? right is SolidColor ? false : true :
+                               left.color == right.color ? false : true;
 
                }
                public override int GetHashCode ()