2008-04-05 Ivan N. Zlatev <contact@i-nz.net>

	* PropertyGridTextBox.cs: Fix background color of the buttons.
	* PropertyGridView.cs: Make the entry less jumpy.

svn path=/trunk/mcs/; revision=99905

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 747446a6dbe8f1bb9beed1a591e25b994352d207..c6f28885eb1b30451df45e4efb3b4301f6a0ba86 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-05  Ivan N. Zlatev  <contact@i-nz.net>
+
+       * PropertyGridTextBox.cs: Fix background color of the buttons.
+       * PropertyGridView.cs: Make the entry less jumpy.
+
 2008-04-05  Ivan N. Zlatev  <contact@i-nz.net>
 
        * PropertyGrid.cs: Fix unused variable warnings.

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridTextBox.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridTextBox.cs
index 52bd3ecb0f4d99f8c2badc175ceeeb13ab2b9e2b..d8815028639891817e02060fa3a236bc81556696 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridTextBox.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridTextBox.cs
@@ -70,22 +70,20 @@ namespace System.Windows.Forms.PropertyGridInternal
                        SuspendLayout();
 
                        dialog_button.Dock = DockStyle.Right;
+                       dialog_button.BackColor = SystemColors.Control;
                        dialog_button.Size = new Size(16, 16);
                        dialog_button.TabIndex = 1;
                        dialog_button.Visible = false;
                        dialog_button.Click += new System.EventHandler(dialog_button_Click);
 
                        dropdown_button.Dock = DockStyle.Right;
+                       dropdown_button.BackColor = SystemColors.Control;
                        dropdown_button.Size = new Size(16, 16);
                        dropdown_button.TabIndex = 2;
                        dropdown_button.Visible = false;
                        dropdown_button.Click += new System.EventHandler(dropdown_button_Click);
 
                        textbox.AutoSize = false;
-                       // this is to explicitly set bgcolor to avoid
-                       // default ReadOnly color (which makes grid item
-                       // bgcolor inconsistent).
-                       textbox.BackColor = textbox.BackColor;
                        textbox.BorderStyle = BorderStyle.None;
                        textbox.Dock = DockStyle.Fill;
                        textbox.TabIndex = 3;
@@ -156,8 +154,6 @@ namespace System.Windows.Forms.PropertyGridInternal
                        }
                        set {
                                textbox.BackColor = value;
-                               dropdown_button.BackColor = value;
-                               dialog_button.BackColor = value;
                                base.BackColor = value;
                        }
                }

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
index 8c0366742ac7216ea2cfb15365c183e8fb96e15b..659033c1b7fe0c680793f50321f04c1eac048cbb 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
@@ -928,9 +928,9 @@ namespace System.Windows.Forms.PropertyGridInternal {
                internal void UpdateView ()
                {
                        UpdateScrollBar ();
-                       UpdateItem (this.SelectedGridItem);
                        Invalidate ();
                        Update ();
+                       UpdateItem (this.SelectedGridItem);
                }
 
                internal void ExpandItem (GridEntry item)