Author: jackson
Date: 2005-12-21 22:15:41 -0500 (Wed, 21 Dec 2005)
New Revision: 54715
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/StatusBar.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
Log:
* StatusBar.cs: Statusbar handles its fore/back colours on it's
on. Because thats how it rolls. (and this avoids it using
ambient
colours).
* ThemeWin32Classic.cs: Use the proper back color for filling.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-12-22 01:55:14 UTC (rev 54714)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-12-22 03:15:41 UTC (rev 54715)
@@ -1,3 +1,10 @@
+2005-12-21 Jackson Harper <[EMAIL PROTECTED]>
+
+ * StatusBar.cs: Statusbar handles its fore/back colours on it's
+ on. Because thats how it rolls. (and this avoids it using ambient
+ colours).
+ * ThemeWin32Classic.cs: Use the proper back color for filling.
+
2005-12-21 Alexander Olk <[EMAIL PROTECTED]>
* ColorDialog.cs: Fixed a memory leak that caused a SIGSEV. A lot of
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/StatusBar.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/StatusBar.cs
2005-12-22 01:55:14 UTC (rev 54714)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/StatusBar.cs
2005-12-22 03:15:41 UTC (rev 54715)
@@ -42,6 +42,9 @@
#region Fields
private StatusBarPanelCollection panels;
+ private Color back_color;
+ private Color fore_color;
+
private bool show_panels = false;
private bool sizing_grip = true;
@@ -52,6 +55,8 @@
public StatusBar ()
{
base.Dock = DockStyle.Bottom;
+ back_color = SystemColors.Control;
+ fore_color = SystemColors.ControlText;
Anchor = AnchorStyles.Top | AnchorStyles.Left;
this.TabStop = false;
this.SetStyle(ControlStyles.UserPaint |
ControlStyles.Selectable, false);
@@ -62,11 +67,11 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public override Color BackColor {
- get { return base.BackColor; }
+ get { return back_color; }
set {
if (value == BackColor)
return;
- base.BackColor = value;
+ back_color = value;
if (BackColorChanged != null)
BackColorChanged (this,
EventArgs.Empty);
Update ();
@@ -112,10 +117,11 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public override Color ForeColor {
- get { return base.ForeColor; }
+ get { return fore_color; }
set {
if (value == ForeColor)
return;
+ fore_color = value;
if (ForeColorChanged != null)
ForeColorChanged (this,
EventArgs.Empty);
Update ();
@@ -272,7 +278,7 @@
if (Width <= 0 || Height <= 0)
return;
- CalcPanelSizes ();
+ Update ();
}
protected override void WndProc(ref Message m) {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
2005-12-22 01:55:14 UTC (rev 54714)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ThemeWin32Classic.cs
2005-12-22 03:15:41 UTC (rev 54715)
@@ -3178,7 +3178,7 @@
Border3DStyle border_style =
Border3DStyle.SunkenInner;
if (panel.BorderStyle ==
StatusBarPanelBorderStyle.Raised)
border_style =
Border3DStyle.RaisedOuter;
- CPDrawBorder3D(dc, area, border_style,
Border3DSide.All, ColorControl);
+ CPDrawBorder3D(dc, area, border_style,
Border3DSide.All, panel.Parent.BackColor);
}
if (panel.Style == StatusBarPanelStyle.OwnerDraw) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
