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

	 * ColorEditor.cs: Perfom action in OnMouseUp only if in client.
	 [Fixes bug #358444]

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

diff --git a/mcs/class/System.Drawing.Design/System.Drawing.Design/ChangeLog b/mcs/class/System.Drawing.Design/System.Drawing.Design/ChangeLog
index 25000b4014776ef97e88c8380dcbccbefd0c70e4..b58209160e49446dec1fb18e1951cdb2e354bec2 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,8 @@
+2008-02-04  Ivan N. Zlatev  <contact@i-nz.net>
+
+        * ColorEditor.cs: Perfom action in OnMouseUp only if in client.
+        [Fixes bug #358444]
+
 2007-11-13  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ToolboxItemCreator.cs, ToolboxService.cs, ToolboxItemContainer.cs:

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 f6058ecfcb63a0162c0fe1668d810c3fb0640f67..728cd95393c4f86612ed4a8b7380add8ec34f3ba 100644 (file)
--- a/mcs/class/System.Drawing.Design/System.Drawing.Design/ColorEditor.cs
+++ b/mcs/class/System.Drawing.Design/System.Drawing.Design/ColorEditor.cs
@@ -344,7 +344,7 @@ namespace System.Drawing.Design
 \r
                        protected override void OnMouseUp (MouseEventArgs e)\r
                        {\r
-                               if (highlighting) {\r
+                               if (highlighting && this.ClientRectangle.Contains (e.X, e.Y)) {\r
                                        if (ColorChanged != null)\r
                                                ColorChanged (colors[y / 24, x / 24], EventArgs.Empty);\r
                                        highlighting = false;\r