Author: igorz
Date: 2006-08-28 03:30:03 -0400 (Mon, 28 Aug 2006)
New Revision: 64461
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
Log:
refactoring
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-08-28 06:44:32 UTC (rev 64460)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-08-28 07:30:03 UTC (rev 64461)
@@ -1,3 +1,8 @@
+2006-08-28 Igor Zelmanovich <[EMAIL PROTECTED]>
+
+ * Menu.cs: refactoring
+ * Style.cs:
+
2006-08-27 Igor Zelmanovich <[EMAIL PROTECTED]>
* TreeView.cs: fixed data binding
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
2006-08-28 06:44:32 UTC (rev 64460)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Menu.cs
2006-08-28 07:30:03 UTC (rev 64461)
@@ -1244,11 +1244,7 @@
}
void RegisterStyle (Style baseStyle, Style linkStyle) {
- if (baseStyle.ForeColor != Color.Empty)
- linkStyle.ForeColor = baseStyle.ForeColor;
- if (!baseStyle.Font.IsEmpty) {
- linkStyle.Font.CopyFrom (baseStyle.Font);
- }
+ linkStyle.CopyTextStylesFrom (baseStyle);
linkStyle.BorderStyle = BorderStyle.None;
RegisterStyle (linkStyle);
RegisterStyle (baseStyle);
@@ -1298,12 +1294,7 @@
}
void AddCssClass (Style style, string cssClass) {
- if (String.IsNullOrEmpty (cssClass))
- return;
-
- if(style.CssClass.Length>0)
- style.CssClass += " ";
- style.CssClass += cssClass;
+ style.AddCssClass (cssClass);
}
public override void RenderBeginTag (HtmlTextWriter writer)
@@ -1642,7 +1633,6 @@
RenderItemHref (writer, item);
- //ControlLinkStyle.AddAttributesToRender (writer);
Style linkStyle = new Style ();
if (Page.Header != null) {
// styles are registered
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
2006-08-28 06:44:32 UTC (rev 64460)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
2006-08-28 07:30:03 UTC (rev 64461)
@@ -851,17 +851,25 @@
}
}
- internal virtual void CopyTextStylesFrom (Style source)
- {
- // Need to ask lluis if we need fonts, too
- if ((styles & Styles.ForeColor) != 0) {
+ internal void CopyTextStylesFrom (Style source) {
+ // Used primary for TreeView and Menu
+ if ((source.styles & Styles.ForeColor) != 0) {
ForeColor = source.ForeColor;
}
- if ((styles & Styles.BackColor) != 0) {
- BackColor = source.BackColor;
+ if (!source.Font.IsEmpty) {
+ Font.CopyFrom (source.Font);
}
}
+ internal void AddCssClass (string cssClass) {
+ if (String.IsNullOrEmpty (cssClass))
+ return;
+
+ if (CssClass.Length > 0)
+ CssClass += " ";
+ CssClass += cssClass;
+ }
+
public void SetDirty ()
{
if (viewstate != null)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
