Reworked Color.NewAlpha functionality. Now calling of this method doe…

…sn't affects instance.
feafarot · Aug 29, 2012 · 733e3ae · 733e3ae
1 parent 998a652
commit 733e3ae
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/RazorTemplatesMvc.Sample/Content/test.cshtml b/RazorTemplatesMvc.Sample/Content/test.cshtml
@@ -6,6 +6,6 @@
     }
     *
     {
-        color: @mainColor;  
+        color: @mainColor;        
     }
 </style>
diff --git a/RazorTemplatesMvc.sln b/RazorTemplatesMvc.sln
@@ -7,7 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RazorTemplatesMvc", "RazorT
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "File Templates", "File Templates", "{D3F2E7B7-E2C6-470F-B18C-0B6B086FDE97}"
 	ProjectSection(SolutionItems) = preProject
-		LICENSE.txt = LICENSE.txt
 		File Templates\Razor Css Template (For .cshtml transform).zip = File Templates\Razor Css Template (For .cshtml transform).zip
 		File Templates\Razor Css Template (Razor CSCSS).zip = File Templates\Razor Css Template (Razor CSCSS).zip
 		File Templates\Razor Js Template (For .cshtml transform).zip = File Templates\Razor Js Template (For .cshtml transform).zip

diff --git a/RazorTemplatesMvc/Handlers/TemplateRouteHttpHandler.cs b/RazorTemplatesMvc/Handlers/TemplateRouteHttpHandler.cs
@@ -7,7 +7,7 @@
     using RazorEngine;
 
     /// <summary>
-    /// Template MVC route and HTTP handler class definition.
+    /// Template MVC route and HTTP handler.
     /// </summary>
     public class TemplateRouteHttpHandler : IRouteHandler, IHttpHandler
     {

diff --git a/RazorTemplatesMvc/Helpers/Css/Color.cs b/RazorTemplatesMvc/Helpers/Css/Color.cs
@@ -15,6 +15,19 @@ public struct Color
 
         private ColorDisplayBehavior colorDisplayBehavior;
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Color"/> struct.
+        /// </summary>
+        /// <param name="color">All data will be copied from this color instance.</param>
+        public Color(Color color)
+        {
+            this.internalAlpha = color.Alpha;
+            this.red = color.Red;
+            this.green = color.Green;
+            this.blue = color.Blue;
+            this.colorDisplayBehavior = color.ColorDisplayBehavior;
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Color"/> struct.
         /// </summary>
@@ -125,8 +138,8 @@ public float Alpha
         /// <returns>Updated color value.</returns>
         public Color NewAlpha(float alpha)
         {
-            Alpha = alpha;
-            return this;
+            var tempColor = new Color(this) { Alpha = alpha };
+            return tempColor;
         }
 
         /// <summary>