Author: mhabersack
Date: 2007-05-03 13:37:16 -0400 (Thu, 03 May 2007)
New Revision: 76631

Modified:
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
Log:
2007-05-03  Marek Habersack  <[EMAIL PROTECTED]>

        * TreeView.cs: honor ChildNodesPadding of the NodeStyle.


Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-05-03 17:23:15 UTC (rev 76630)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog      
2007-05-03 17:37:16 UTC (rev 76631)
@@ -1,3 +1,7 @@
+2007-05-03  Marek Habersack  <[EMAIL PROTECTED]>
+
+       * TreeView.cs: honor ChildNodesPadding of the NodeStyle.
+
 2007-05-03 Igor Zelmanovich <[EMAIL PROTECTED]>
 
        * ControlPropertyNameConverter.css:

Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs    
2007-05-03 17:23:15 UTC (rev 76630)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs    
2007-05-03 17:37:16 UTC (rev 76631)
@@ -1444,6 +1444,7 @@
                        
                        if (hasChildNodes)
                        {
+                               AddChildrenPadding (writer, node);
                                if (level >= levelLines.Count) {
                                        if (hasNext) levelLines.Add (this);
                                        else levelLines.Add (null);
@@ -1470,9 +1471,32 @@
                                        for (int n=0; n<num; n++)
                                                RenderNode (writer, 
node.ChildNodes [n], level + 1, levelLines, true, n<num-1);
                                }
+                               AddChildrenPadding (writer, node);
                        }
                }
 
+               private void AddChildrenPadding (HtmlTextWriter writer, 
TreeNode node)
+               {
+                       if (nodeStyle == null)
+                               return;
+                       Unit cnp = nodeStyle.ChildNodesPadding;
+                       double value;
+                       
+                       if (cnp.IsEmpty || (value = cnp.Value) == 0)
+                               return;
+
+                       if (cnp.Type != UnitType.Pixel)
+                               return;
+
+                       writer.RenderBeginTag (HtmlTextWriterTag.Table);
+                       writer.AddAttribute ("height", ((int)value).ToString 
());
+                       writer.RenderBeginTag (HtmlTextWriterTag.Tr);
+                       writer.RenderBeginTag (HtmlTextWriterTag.Td);
+                       writer.RenderEndTag (); // td
+                       writer.RenderEndTag (); // tr
+                       writer.RenderEndTag (); // table
+               }
+               
                private void RenderMenuItemSpacing (HtmlTextWriter writer, Unit 
itemSpacing) {
                        writer.AddStyleAttribute ("height", 
itemSpacing.ToString ());
                        writer.RenderBeginTag (HtmlTextWriterTag.Tr);

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

Reply via email to