Author: kostat
Date: 2006-01-18 03:57:28 -0500 (Wed, 18 Jan 2006)
New Revision: 55711

Modified:
   trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs
Log:
preserve emptiness in ColorFormatter

Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog  2006-01-18 08:51:22 UTC 
(rev 55710)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog  2006-01-18 08:57:28 UTC 
(rev 55711)
@@ -1,5 +1,9 @@
 2006-01-18 Konstantin Triger <[EMAIL PROTECTED]>
 
+       * ObjectStateFormatter.cs: preserve emptiness in ColorFormatter.
+
+2006-01-18 Konstantin Triger <[EMAIL PROTECTED]>
+
        * HtmlTextWriter.cs: perform case insensitive compare;
          return correct key in default case.
 

Modified: trunk/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs    
2006-01-18 08:51:22 UTC (rev 55710)
+++ trunk/mcs/class/System.Web/System.Web.UI/ObjectStateFormatter.cs    
2006-01-18 08:57:28 UTC (rev 55711)
@@ -663,19 +663,24 @@
                                
                                if (!c.IsKnownColor) {
                                        w.Write (PrimaryId);
-                                       w.Write (c.ToArgb ());
+                                       w.Write(c.IsEmpty);
+                                       if (!c.IsEmpty)
+                                               w.Write (c.ToArgb ());
                                } else {
                                        w.Write (SecondaryId);
-                                       w.Write ((int) c.ToKnownColor ());
+                                       w.Write(c.IsEmpty);
+                                       if (!c.IsEmpty)
+                                               w.Write ((int) c.ToKnownColor 
());
                                }
                        }
                        
                        protected override object Read (byte token, 
BinaryReader r, ReaderContext ctx)
                        {
+                               bool isEmpty = r.ReadBoolean();
                                if (token == PrimaryId)
-                                       return Color.FromArgb (r.ReadInt32 ());
+                                       return isEmpty ? Color.Empty : 
Color.FromArgb (r.ReadInt32 ());
                                else
-                                       return Color.FromKnownColor 
((KnownColor) r.ReadInt32 ());
+                                       return isEmpty ? Color.Empty : 
Color.FromKnownColor ((KnownColor) r.ReadInt32 ());
                        }
                        
                        protected override Type Type {

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to