Author: mhabersack
Date: 2007-05-08 05:01:54 -0400 (Tue, 08 May 2007)
New Revision: 76905
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-08 Marek Habersack <[EMAIL PROTECTED]>
* TreeView.cs: children padding is rendered only before and after
the children are rendered, not between them. Also, render padding
only if there are any nodes to follow the current one.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-05-08 08:40:25 UTC (rev 76904)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-05-08 09:01:54 UTC (rev 76905)
@@ -1,3 +1,9 @@
+2007-05-08 Marek Habersack <[EMAIL PROTECTED]>
+
+ * TreeView.cs: children padding is rendered only before and after
+ the children are rendered, not between them. Also, render padding
+ only if there are any nodes to follow the current one.
+
2007-05-07 Marek Habersack <[EMAIL PROTECTED]>
* Wizard.cs: additional checks to see whether the wizard needs to
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-08 08:40:25 UTC (rev 76904)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs
2007-05-08 09:01:54 UTC (rev 76905)
@@ -1442,36 +1442,44 @@
// Children
- if (hasChildNodes)
- {
- AddChildrenPadding (writer, node);
+ if (hasChildNodes) {
if (level >= levelLines.Count) {
- if (hasNext) levelLines.Add (this);
- else levelLines.Add (null);
+ if (hasNext)
+ levelLines.Add (this);
+ else
+ levelLines.Add (null);
} else {
- if (hasNext) levelLines [level] = this;
- else levelLines [level] = null;
+ if (hasNext)
+ levelLines [level] = this;
+ else
+ levelLines [level] = null;
}
if (clientExpand) {
- if (!(node.Expanded.HasValue &&
node.Expanded.Value)) writer.AddStyleAttribute ("display", "none");
- else writer.AddStyleAttribute
("display", "block");
+ if (!(node.Expanded.HasValue &&
node.Expanded.Value))
+ writer.AddStyleAttribute
("display", "none");
+ else
+ writer.AddStyleAttribute
("display", "block");
writer.AddAttribute ("id",
GetNodeClientId (node, null));
writer.RenderBeginTag
(HtmlTextWriterTag.Span);
if (renderChildNodes) {
+ AddChildrenPadding (writer,
node);
int num = node.ChildNodes.Count;
for (int n=0; n<num; n++)
RenderNode (writer,
node.ChildNodes [n], level + 1, levelLines, true, n<num-1);
+ if (hasNext)
+ AddChildrenPadding
(writer, node);
}
writer.RenderEndTag (); // SPAN
- }
- else if (renderChildNodes) {
+ } else if (renderChildNodes) {
+ AddChildrenPadding (writer, node);
int num = node.ChildNodes.Count;
for (int n=0; n<num; n++)
RenderNode (writer,
node.ChildNodes [n], level + 1, levelLines, true, n<num-1);
+ if (hasNext)
+ AddChildrenPadding (writer,
node);
}
- AddChildrenPadding (writer, node);
}
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches