2007-08-10 Jonathan Pobst <monkey@jpobst.com>

[Backport of r83821] * ToolTip.cs: Hide the tooltip if the control is clicked to match MS behavior. [Fixes bug #82348] svn path=/branches/mono-1-2-5/mcs/; revision=83823
baulig · Aug 10, 2007 · 6e04ed5 · 6e04ed5
1 parent 04c3bba
commit 6e04ed5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-10  Jonathan Pobst  <monkey@jpobst.com>
+	[Backport of r83821]
+	* ToolTip.cs: Hide the tooltip if the control is clicked to match MS behavior.
+	[Fixes bug #82348]
+
 2007-08-02  Rolf Bjarne Kvinge <RKvinge@novell.com> 
 
 	[ Backport selected parts of r82743, fixes #82234]

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
@@ -390,6 +390,7 @@ public string GetToolTip (Control control)
 				control.MouseEnter += new EventHandler(control_MouseEnter);
 				control.MouseMove += new MouseEventHandler(control_MouseMove);
 				control.MouseLeave += new EventHandler(control_MouseLeave);
+				control.MouseDown += new MouseEventHandler (control_MouseDown);
 				controls.Add(control);
 			}
 
@@ -549,6 +550,18 @@ private void control_MouseLeave(object sender, EventArgs e)
 			Hide (sender as Control);
 		}
 
+
+		void control_MouseDown (object sender, MouseEventArgs e)
+		{
+			timer.Stop();
+
+			active_control = null;
+			tooltip_window.Visible = false;
+
+			if (last_control == sender)
+				last_control = null;
+		}
+
 		private void Hide (Control sender)
 		{
 			timer.Stop();