Sfoglia il codice sorgente

* TreeView.cs: fixed RegisterStyle, style names should be without leading underscore. fixed RenderNode, node icons should be taken also from level styles

svn path=/trunk/mcs/; revision=71196
Vladimir Krasnov 19 anni fa
parent
commit
2f8efd3bbc

+ 6 - 0
mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,9 @@
+2007-01-17  Vladimir Krasnov  <[email protected]>
+
+	* TreeView.cs: fixed RegisterStyle, style names should be without
+	leading underscore. fixed RenderNode, node icons should be taken also
+	from level styles
+
 2007-01-17  Adar Wesley <[email protected]>
 
 	* Repeater.cs: refactored GetData to return data both from DataSource

+ 4 - 1
mcs/class/System.Web/System.Web.UI.WebControls/TreeView.cs

@@ -1166,7 +1166,7 @@ namespace System.Web.UI.WebControls
 		void RegisterStyle (Style baseStyle) {
 			if (Page.Header == null)
 				return;
-			string className = IncrementStyleClassName ();
+			string className = IncrementStyleClassName ().Trim ('_');
 			baseStyle.SetRegisteredCssClass (className);
 			Page.Header.StyleSheet.CreateStyleRule (baseStyle, this, "." + className);
 		}
@@ -1382,6 +1382,9 @@ namespace System.Web.UI.WebControls
 					imageUrl = GetNodeIconUrl (imageStyle.LeafIcon);
 			}
 			
+			if (level < LevelStyles.Count && LevelStyles [level].ImageUrl != null)
+				imageUrl = ResolveClientUrl (LevelStyles [level].ImageUrl);
+			
 			if (!String.IsNullOrEmpty (imageUrl)) {
 				writer.RenderBeginTag (HtmlTextWriterTag.Td);	// TD
 				BeginNodeTag (writer, node, clientExpand);