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

	* ColorEditor.cs: Set the Height to match the custom colors tab
	Height.
	[Fixes bug #356527]

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

diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design/ChangeLog b/mcs/class/System.Drawing.Design/System.Drawing.Design/ChangeLog
index b58209160e49446dec1fb18e1951cdb2e354bec2..90a1790ae34542ac0d03a3802861dfa894097f21 100644 (file)
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design/ChangeLog
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-05  Ivan N. Zlatev  <contact@i-nz.net>
+
+       * ColorEditor.cs: Set the Height to match the custom colors tab
+       Height.
+       [Fixes bug #356527]
+
 2008-02-04  Ivan N. Zlatev  <contact@i-nz.net>
 
         * ColorEditor.cs: Perfom action in OnMouseUp only if in client.

diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design/ColorEditor.cs b/mcs/class/System.Drawing.Design/System.Drawing.Design/ColorEditor.cs
index 728cd95393c4f86612ed4a8b7380add8ec34f3ba..3b1b8e59a58fcb83d24a9cd055866a870be4598a 100644 (file)
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design/ColorEditor.cs
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design/ColorEditor.cs
@@ -123,7 +123,7 @@ namespace System.Drawing.Design
                                                color_chosen = true;
                                        }
 
-
+                                       tab_control.Height = 192; // the height of the custom colors tab
                                        editorService.DropDownControl(tab_control);
                                        if (color_chosen) {
                                                return selected_color;