Merge pull request #8946 from pchote/fix-faction-tooltips

Fix orphaned tooltips when dismissing a dropdown.

OpenRA.Game/Widgets/Widget.cs

@@ -131,6 +131,13 @@ namespace OpenRA.Widgets
 			while (WindowList.Count > 0)
 				CloseWindow();
 		}
+
+		public static void ResetTooltips()
+		{
+			// Issue a no-op mouse move to force any tooltips to be recalculated
+			HandleInput(new MouseInput(MouseInputEvent.Move, MouseButton.None, 0,
+				Viewport.LastMousePos, Modifiers.None, 0));
+		}
 	}
 
 	public abstract class Widget

OpenRA.Mods.Common/Widgets/DropDownButtonWidget.cs

@@ -67,6 +67,8 @@ namespace OpenRA.Mods.Common.Widgets
 			panelRoot.RemoveChild(fullscreenMask);
 			panelRoot.RemoveChild(panel);
 			panel = fullscreenMask = null;
+
+			Ui.ResetTooltips();
 		}
 
 		public void AttachPanel(Widget p) { AttachPanel(p, null); }

OpenRA.Mods.Common/Widgets/ScrollPanelWidget.cs

@@ -79,10 +79,7 @@ namespace OpenRA.Mods.Common.Widgets
 
 				// Update mouseover
 				if (oldListOffset != currentListOffset)
-				{
-					var mi = new MouseInput(MouseInputEvent.Move, MouseButton.None, 0, Viewport.LastMousePos, Modifiers.None, 0);
-					Ui.HandleInput(mi);
-				}
+					Ui.ResetTooltips();
 			}
 		}
 
@@ -266,9 +263,7 @@ namespace OpenRA.Mods.Common.Widgets
 			{
 				currentListOffset += offsetDiff * SmoothScrollSpeed.Clamp(0.1f, 1.0f);
 
-				// Update mouseover
-				var mi = new MouseInput(MouseInputEvent.Move, MouseButton.None, 0, Viewport.LastMousePos, Modifiers.None, 0);
-				Ui.HandleInput(mi);
+				Ui.ResetTooltips();
 			}
 			else
 				SetListOffset(targetListOffset, false);