* ToolTip.cs: ShowAlways works at the form level, not at the control

level. Fixes #544565. 2009-11-11 Carlos Alberto Cortez <calberto.cortez@gmail.com> svn path=/branches/mono-2-4/mcs/; revision=145938
baulig · Nov 11, 2009 · 354c980 · 354c980
1 parent 7979db0
commit 354c980
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 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 @@
+2009-11-11  Carlos Alberto Cortez <calberto.cortez@gmail.com>
+
+	* ToolTip.cs: ShowAlways works at the form level, not at the control
+	level. Fixes #544565.
+
 2009-11-11  Carlos Alberto Cortez <calberto.cortez@gmail.com>
 
 	* ButtonBase.cs: Usually the click routines are handled in Control,

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ToolTip.cs
@@ -869,17 +869,11 @@ private void ShowTooltip (Control control)
 			if (!is_active)
 				return;
 
-			// Display tooltips only for the controls in the active form
-			if (control.FindForm () != Form.ActiveForm)
+			// ShowAlways controls whether the controls in non-active forms
+			// can display its tooltips, even if they are not current active control.
+			if (!show_always && control.FindForm () != Form.ActiveForm)
 				return;
 
-			if (!show_always) {
-				IContainerControl cc = last_control.GetContainerControl ();
-				if ((cc == null) || (cc.ActiveControl == null)) {
-					return;
-				}
-			}
-
 			string text = (string)tooltip_strings[control];
 			if (text != null && text.Length > 0) {
 				if (active_control == null) {