Merge pull request #2110 from Unity-Technologies/unity-6000.1-mbe-fix-uum-79065

[6000.1] Make sure tooltip window handle is being destroyed when parent window/control is destroyed

Author: zorana-curkovic

mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridView.cs

@@ -6552,7 +6552,7 @@ private Timer ToolTipTimer {
 		private ToolTip ToolTipWindow {
 			get {
 				if (tooltip_window == null)
-					tooltip_window = new ToolTip ();
+					tooltip_window = new ToolTip (this);
 
 				return tooltip_window;
 			}

mcs/class/System.Windows.Forms/System.Windows.Forms/FileDialog.cs

@@ -2296,10 +2296,6 @@ public MWFFileView (MWFVFS vfs)
 
 			contextMenu = new ContextMenu ();
 
-			toolTip = new ToolTip ();
-			toolTip.InitialDelay = 300;
-			toolTip.ReshowDelay = 0; 
-			
 			// contextMenu
 
 			// View menu item
@@ -2458,6 +2454,18 @@ public string SelectedFilesString {
 				return selectedFilesString;
 			}
 		}
+
+		private ToolTip ToolTipWindow {
+			get {
+				if (toolTip == null) {
+					toolTip = new ToolTip(this);
+					toolTip.InitialDelay = 300;
+					toolTip.ReshowDelay = 0;
+				}
+
+				return toolTip;
+			}
+		}
 
 		public void PushDir ()
 		{
@@ -2891,8 +2899,8 @@ protected override void OnMouseMove (MouseEventArgs e)
 				if (currentItemIndex != oldItemIndexForToolTip) {
 					oldItemIndexForToolTip = currentItemIndex;
 
-					if (toolTip != null && toolTip.Active)
-						toolTip.Active = false;
+					if (ToolTipWindow.Active)
+						ToolTipWindow.Active = false;
 
 					FSEntry fsEntry = item.FSEntry;
 
@@ -2907,12 +2915,12 @@ protected override void OnMouseMove (MouseEventArgs e)
 					else
 						output = Locale.GetText("File: {0}", fsEntry.FullName);
 
-					toolTip.SetToolTip (this, output);	
+					ToolTipWindow.SetToolTip (this, output);
 
-					toolTip.Active = true;
+					ToolTipWindow.Active = true;
 				}
 			} else
-				toolTip.Active = false;
+				ToolTipWindow.Active = false;
 
 			base.OnMouseMove (e);
 		}

mcs/class/System.Windows.Forms/System.Windows.Forms/InternalWindowManager.cs

@@ -1072,7 +1072,7 @@ public void ToolTipShow (bool only_refresh)
 			}
 
 			if (tooltip == null)
-				tooltip = new ToolTip.ToolTipWindow ();
+				tooltip = new ToolTip.ToolTipWindow (form);
 			else if (tooltip.Text == text && tooltip.Visible)
 				return;
 			else if (tooltip.Visible)

mcs/class/System.Windows.Forms/System.Windows.Forms/ListView.cs

@@ -271,8 +271,6 @@ public ListView ()
 			items_location = new Point [16];
 			items_matrix_location = new ItemMatrixLocation [16];
 			reordered_items_indices = new int [16];
-			item_tooltip = new ToolTip ();
-			item_tooltip.Active = false;
 			insertion_mark = new ListViewInsertionMark (this);
 
 			InternalBorderStyle = BorderStyle.Fixed3D;
@@ -316,7 +314,7 @@ public ListView ()
 		}
 		#endregion	// Public Constructors
 
-		#region Private Internal Properties
+		#region Private & Internal Properties
 		internal Size CheckBoxSize {
 			get {
 				if (this.check_boxes) {
@@ -377,6 +375,16 @@ internal ColumnHeader EnteredColumnHeader {
 				return header_control.EnteredColumnHeader;
 			}
 		}
+
+		private ToolTip ToolTipWindow {
+			get {
+				if (item_tooltip == null) {
+					item_tooltip = new ToolTip(this);
+					item_tooltip.Active = false;
+				}
+				return item_tooltip;
+			}
+		}
 		#endregion	// Private Internal Properties
 
 		#region	 Protected Properties
@@ -815,7 +823,7 @@ public bool ShowItemToolTips {
 			}
 			set {
 				show_item_tooltips = value;
-				item_tooltip.Active = false;
+				ToolTipWindow.Active = false;
 			}
 		}
 
@@ -2779,11 +2787,11 @@ private void ItemsMouseMove (object sender, MouseEventArgs me)
 
 				if (owner.ShowItemToolTips) {
 					if (item == null) {
-						owner.item_tooltip.Active = false;
+						owner.ToolTipWindow.Active = false;
 						prev_tooltip_item = null;
 					} else if (item != prev_tooltip_item && item.ToolTipText.Length > 0) {
-						owner.item_tooltip.Active = true;
-						owner.item_tooltip.SetToolTip (owner, item.ToolTipText);
+						owner.ToolTipWindow.Active = true;
+						owner.ToolTipWindow.SetToolTip (owner, item.ToolTipText);
 						prev_tooltip_item = item;
 					}
 				}

mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBar.cs

@@ -466,7 +466,7 @@ private Timer ToolTipTimer {
 		private ToolTip ToolTipWindow {
 			get {
 				if (tooltip_window == null)
-					tooltip_window = new ToolTip ();
+					tooltip_window = new ToolTip (this);
 
 				return tooltip_window;
 			}

mcs/class/System.Windows.Forms/System.Windows.Forms/TabControl.cs

@@ -1509,7 +1509,7 @@ void SetToolTip (string text)
 			}
 
 			if (tooltip == null) {
-				tooltip = new ToolTip ();
+				tooltip = new ToolTip (this);
 				tooltip_timer = new Timer ();
 				tooltip_timer.Tick += new EventHandler (ToolTipTimerTick);
 			}

mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBar.cs

@@ -899,7 +899,7 @@ private void ToolBar_MouseHover (object sender, EventArgs e)
 				return;
 
 			if (tip_window == null)
-				tip_window = new ToolTip ();
+				tip_window = new ToolTip (this);
 
 			ToolBarItem item = ItemAtPoint (PointToClient (Control.MousePosition));
 			current_item = item;

mcs/class/System.Windows.Forms/System.Windows.Forms/ToolStrip.cs

@@ -1572,7 +1572,7 @@ private Timer ToolTipTimer {
 		private ToolTip ToolTipWindow {
 			get {
 				if (tooltip_window == null)
-					tooltip_window = new ToolTip ();
+					tooltip_window = new ToolTip (this);
 
 				return tooltip_window;
 			}

mcs/class/System.Windows.Forms/System.Windows.Forms/ToolStripTextBox.cs

@@ -568,7 +568,7 @@ private Timer ToolTipTimer {
 			private ToolTip ToolTipWindow {
 				get {
 					if (tooltip_window == null)
-						tooltip_window = new ToolTip ();
+						tooltip_window = new ToolTip (this);
 
 					return tooltip_window;
 				}

mcs/class/System.Windows.Forms/System.Windows.Forms/ToolTip.cs

@@ -75,7 +75,7 @@ internal class ToolTipWindow : Control {
 			#endregion	// ToolTipWindow Class Local Variables
 
 			#region ToolTipWindow Class Constructor
-			internal ToolTipWindow() {
+			internal ToolTipWindow(Control owner = null) {
 				Visible = false;
 				Size = new Size(100, 20);
 				ForeColor = ThemeEngine.Current.ColorInfoText;
@@ -94,9 +94,15 @@ internal ToolTipWindow() {
 				} else
 					SetStyle (ControlStyles.Opaque, true);
 
-				SetTopLevel (true);
+				if (owner == null) {
+					SetTopLevel (true);
+				} else {
+					SetTopLevel (false);
+					owner.Controls.Add(this);
+				}
 			}
 
+
 			#endregion	// ToolTipWindow Class Constructor
 
 			#region ToolTipWindow Class Protected Instance Methods
@@ -288,7 +294,7 @@ internal event PopupEventHandler UnPopup {
 		#endregion	// ToolTipWindow Class
 
 		#region Public Constructors & Destructors
-		public ToolTip() {
+		public ToolTip(Control owner = null) {
 
 			// Defaults from MS
 			is_active = true;
@@ -307,7 +313,7 @@ public ToolTip() {
 			tooltip_strings = new Hashtable(5);
 			controls = new ArrayList(5);
 
-			tooltip_window = new ToolTipWindow();
+			tooltip_window = new ToolTipWindow(owner);
 			tooltip_window.MouseLeave += new EventHandler(control_MouseLeave);
 			tooltip_window.Draw += new DrawToolTipEventHandler (tooltip_window_Draw);
 			tooltip_window.Popup += new PopupEventHandler (tooltip_window_Popup);