Bugfixes.

OpenRA · May 19, 2020 · b9c0ff5 · b9c0ff5
1 parent bcb9849
commit b9c0ff5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/OpenRA.Game/Widgets/Widget.cs b/OpenRA.Game/Widgets/Widget.cs
@@ -498,6 +498,7 @@ public virtual void RemoveChild(Widget child)
 			{
 				children.Remove(child);
 				Node.RemoveChild(child.Node);
+				child.Node.CalculateLayout();
 				child.parent = null;
 				child.Removed();
 			}

diff --git a/OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/MainMenuLogic.cs
@@ -438,7 +438,7 @@ void OpenMissionBrowserPanel()
 			Game.OpenWindow("MISSIONBROWSER_PANEL", new WidgetArgs
 			{
 				{ "onExit", () => SwitchMenu(MenuType.Singleplayer) },
-				{ "onStart", () => { RemoveShellmapUI(); lastGameState = MenuPanel.Missions; } }
+				{ "onStart", () => { lastGameState = MenuPanel.Missions; } }
 			});
 		}
 
@@ -448,7 +448,7 @@ void OpenSkirmishLobbyPanel()
 			Game.OpenWindow("SERVER_LOBBY", new WidgetArgs
 			{
 				{ "onExit", () => { Game.Disconnect(); SwitchMenu(MenuType.Singleplayer); } },
-				{ "onStart", () => { RemoveShellmapUI(); lastGameState = MenuPanel.Skirmish; } },
+				{ "onStart", () => { lastGameState = MenuPanel.Skirmish; } },
 				{ "skirmishMode", true }
 			});
 		}
@@ -458,7 +458,7 @@ void OpenMultiplayerPanel()
 			SwitchMenu(MenuType.None);
 			Ui.OpenWindow("MULTIPLAYER_PANEL", new WidgetArgs
 			{
-				{ "onStart", () => { RemoveShellmapUI(); lastGameState = MenuPanel.Multiplayer; } },
+				{ "onStart", () => { lastGameState = MenuPanel.Multiplayer; } },
 				{ "onExit", () => SwitchMenu(MenuType.Main) },
 				{ "directConnectEndPoint", null },
 			});
@@ -470,7 +470,7 @@ void OpenReplayBrowserPanel()
 			Ui.OpenWindow("REPLAYBROWSER_PANEL", new WidgetArgs
 			{
 				{ "onExit", () => SwitchMenu(MenuType.Extras) },
-				{ "onStart", () => { RemoveShellmapUI(); lastGameState = MenuPanel.Replays; } }
+				{ "onStart", () => { lastGameState = MenuPanel.Replays; } }
 			});
 		}
 
@@ -480,7 +480,7 @@ void OpenGameSaveBrowserPanel()
 			Ui.OpenWindow("GAMESAVE_BROWSER_PANEL", new WidgetArgs
 			{
 				{ "onExit", () => SwitchMenu(MenuType.Singleplayer) },
-				{ "onStart", () => { RemoveShellmapUI(); lastGameState = MenuPanel.GameSaves; } },
+				{ "onStart", () => { lastGameState = MenuPanel.GameSaves; } },
 				{ "isSavePanel", false },
 				{ "world", null }
 			});

diff --git a/OpenRA.Mods.Common/Widgets/Logic/PlayerProfileLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/PlayerProfileLogic.cs
@@ -264,7 +264,7 @@ public RegisteredProfileTooltipLogic(Widget widget, WorldRenderer worldRenderer,
 			};
 
 			message.GetText = () => messageText;
-			header.Node.Height = header.Node.LayoutHeight + (int)messageHeader.Node.LayoutHeight;
+			header.Node.Height = (int)header.Node.LayoutHeight + (int)messageHeader.Node.LayoutHeight;
 			header.Node.Width = widget.Node.Width = messageWidth;
 			header.Node.CalculateLayout();
 			widget.Node.CalculateLayout();