Author: rolf
Date: 2007-07-10 14:48:26 -0400 (Tue, 10 Jul 2007)
New Revision: 81736
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridTextBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
Log:
[ Fixes #79761]
* PropertyGridTextBox.cs: Propagate any color changes to all contained
controls.
* PropertyGridView.cs: A few color fixes.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-07-10 18:46:34 UTC (rev 81735)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-07-10 18:48:26 UTC (rev 81736)
@@ -1,3 +1,11 @@
+2007-07-10 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+
+ [ Fixes #79761]
+
+ * PropertyGridTextBox.cs: Propagate any color changes to all contained
+ controls.
+ * PropertyGridView.cs: A few color fixes.
+
2007-07-10 Jackson Harper <[EMAIL PROTECTED]>
* TextControl.cs: Remove some old unused text formatting stuff.
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridTextBox.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridTextBox.cs
2007-07-10 18:46:34 UTC (rev 81735)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridTextBox.cs
2007-07-10 18:48:26 UTC (rev 81736)
@@ -100,6 +100,29 @@
}
}
+ public new Color ForeColor {
+ get {
+ return base.ForeColor;
+ }
+ set {
+ textbox.ForeColor = value;
+ dropdown_button.ForeColor = value;
+ dialog_button.ForeColor = value;
+ base.ForeColor = value;
+ }
+ }
+
+ public new Color BackColor {
+ get {
+ return base.BackColor;
+ }
+ set {
+ textbox.BackColor = value;
+ dropdown_button.BackColor = value;
+ dialog_button.BackColor = value;
+ base.BackColor = value;
+ }
+ }
public bool ReadOnly {
get {
return textbox.ReadOnly;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
2007-07-10 18:46:34 UTC (rev 81735)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
2007-07-10 18:48:26 UTC (rev 81736)
@@ -93,7 +93,7 @@
grid_textbox.Visible = false;
grid_textbox.Font = this.Font;
- grid_textbox.BackColor = this.BackColor;
+ grid_textbox.BackColor = SystemColors.Window;
// Not working at all, used to??
grid_textbox.Validating += new
CancelEventHandler(TextBoxValidating);
grid_textbox.ToggleValue+=new
EventHandler(grid_textbox_ToggleValue);
@@ -958,6 +958,7 @@
}
grid_textbox.ReadOnly = grid_textbox.ReadOnly ||
forItem.PropertyDescriptor.IsReadOnly;
+ grid_textbox.ForeColor = grid_textbox.ReadOnly ?
SystemColors.InactiveCaption : SystemColors.WindowText;
int xloc = SplitterLocation + 1 + (paintsValue ? 27 :
0);
grid_textbox.SetBounds (xloc,
@@ -1038,6 +1039,8 @@
private void DropDownControl(Control control, bool block) {
Object queue_id;
+ Form owner = FindForm ();
+
dropdown_form.Size = control.Size;
control.Dock = DockStyle.Fill;
dropdown_form.Controls.Clear();
@@ -1045,7 +1048,7 @@
dropdown_form.Location = PointToScreen(new
Point(SplitterLocation,grid_textbox.Location.Y+row_height));
dropdown_form.Width = ClientRectangle.Width -
SplitterLocation - (vbar.Visible ? vbar.Width : 0);
- FindForm ().AddOwnedForm (dropdown_form);
+ owner.AddOwnedForm (dropdown_form);
dropdown_form.Show();
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches