Merge pull request #6753 from pchote/ingame-menu-cleanup

Ingame menu cleanup

OpenRA.Mods.Common/Widgets/Logic/Ingame/LoadIngamePlayerOrObserverUILogic.cs

@@ -19,7 +19,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 		public LoadIngamePlayerOrObserverUILogic(Widget widget, World world)
 		{
 			var ingameRoot = widget.Get("INGAME_ROOT");
-			var playerRoot = ingameRoot.Get("PLAYER_ROOT");
+			var worldRoot = ingameRoot.Get("WORLD_ROOT");
+			var menuRoot = ingameRoot.Get("MENU_ROOT");
+			var playerRoot = worldRoot.Get("PLAYER_ROOT");
 
 			if (world.LocalPlayer == null)
 				Game.LoadWidget(world, "OBSERVER_WIDGETS", playerRoot, new WidgetArgs());
@@ -40,14 +42,14 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				};
 			}
 
-			Game.LoadWidget(world, "CHAT_PANEL", ingameRoot, new WidgetArgs());
+			Game.LoadWidget(world, "CHAT_PANEL", worldRoot, new WidgetArgs());
 
-			Action showLeaveMapWidget = () =>
+			world.GameOver += () =>
 			{
-				ingameRoot.RemoveChildren();
+				worldRoot.RemoveChildren();
-				Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs());
+				menuRoot.RemoveChildren();
+				Game.LoadWidget(world, "LEAVE_MAP_WIDGET", menuRoot, new WidgetArgs());
 			};
-			world.GameOver += showLeaveMapWidget;
 		}
 	}
 }

OpenRA.Mods.D2k/Widgets/Logic/IngameChromeLogic.cs

@@ -25,7 +25,9 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 {
 	public class IngameChromeLogic
 	{
-		readonly Widget gameRoot;
+		readonly Widget ingameRoot;
+		readonly Widget worldRoot;
+		readonly Widget menuRoot;
 		readonly Widget playerRoot;
 		readonly World world;
 
@@ -33,8 +35,10 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 		public IngameChromeLogic(World world)
 		{
 			this.world = world;
-			gameRoot = Ui.Root.Get("INGAME_ROOT");
+			ingameRoot = Ui.Root.Get("INGAME_ROOT");
-			playerRoot = gameRoot.Get("PLAYER_ROOT");
+			worldRoot = ingameRoot.Get("WORLD_ROOT");
+			menuRoot = ingameRoot.Get("MENU_ROOT");
+			playerRoot = worldRoot.Get("PLAYER_ROOT");
 
 			InitRootWidgets();
 			if (world.LocalPlayer == null)
@@ -45,14 +49,14 @@ namespace OpenRA.Mods.D2k.Widgets.Logic
 
 		void InitRootWidgets()
 		{
-			Game.LoadWidget(world, "CHAT_PANEL", gameRoot, new WidgetArgs());
+			Game.LoadWidget(world, "CHAT_PANEL", worldRoot, new WidgetArgs());
 
-			Action ShowLeaveMapWidget = () =>
+			world.GameOver += () =>
 			{
-				gameRoot.RemoveChildren();
+				worldRoot.RemoveChildren();
-				Game.LoadWidget(world, "LEAVE_MAP_WIDGET", Ui.Root, new WidgetArgs());
+				menuRoot.RemoveChildren();
+				Game.LoadWidget(world, "LEAVE_MAP_WIDGET", menuRoot, new WidgetArgs());
 			};
-			world.GameOver += ShowLeaveMapWidget;
 		}
 
 		void InitObserverWidgets()

OpenRA.Mods.RA/Widgets/Logic/Ingame/LeaveMapLogic.cs

@@ -31,6 +31,10 @@ namespace OpenRA.Mods.RA.Widgets
 		{
 			this.orderManager = orderManager;
 
+			var mpe = world.WorldActor.TraitOrDefault<MenuPaletteEffect>();
+			if (mpe != null)
+				mpe.Fade(mpe.Info.MenuEffect);
+
 			widget.Get<LabelWidget>("VERSION_LABEL").Text = Game.modData.Manifest.Mod.Version;
 
 			var showStats = false;
@@ -95,7 +99,6 @@ namespace OpenRA.Mods.RA.Widgets
 			leaveButton.OnClick = () =>
 			{
 				leaveButton.Disabled = true;
-				var mpe = world.WorldActor.TraitOrDefault<MenuPaletteEffect>();
 
 				Sound.PlayNotification(world.Map.Rules, null, "Speech", "Leave",
 					world.LocalPlayer == null ? null : world.LocalPlayer.Country.Race);

OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs

@@ -56,7 +56,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			Action closeMenu = () =>
 			{
 				Ui.CloseWindow();
-				Ui.Root.RemoveChild(menu);
 				if (mpe != null)
 					mpe.Fade(MenuPaletteEffect.EffectType.None);
 				onExit();
@@ -110,12 +109,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			resumeButton.IsDisabled = () => resumeDisabled;
 			resumeButton.OnClick = closeMenu;
 
-			// Game info panel
+			var panelRoot = widget.GetOrNull("PANEL_ROOT");
-			var gameInfoPanel = Game.LoadWidget(world, "GAME_INFO_PANEL", menu, new WidgetArgs()
+			if (panelRoot != null)
+			{
+				var gameInfoPanel = Game.LoadWidget(world, "GAME_INFO_PANEL", panelRoot, new WidgetArgs()
 				{
 					{ "activePanel", activePanel }
 				});
+
 				gameInfoPanel.IsVisible = () => !hideMenu;
 			}
 		}
 	}
+}

OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs

@@ -20,7 +20,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 	public class OrderButtonsChromeLogic
 	{
 		readonly World world;
-		readonly Widget ingameRoot;
+		readonly Widget worldRoot;
+		readonly Widget menuRoot;
 		bool disableSystemButtons;
 		Widget currentWidget;
 
@@ -28,9 +29,11 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 		public OrderButtonsChromeLogic(Widget widget, World world)
 		{
 			this.world = world;
-			ingameRoot = Ui.Root.Get("INGAME_ROOT");
+			var ingameRoot = Ui.Root.Get("INGAME_ROOT");
+			worldRoot = ingameRoot.Get("WORLD_ROOT");
+			menuRoot = ingameRoot.Get("MENU_ROOT");
 
-			Action removeCurrentWidget = () => Ui.Root.RemoveChild(currentWidget);
+			Action removeCurrentWidget = () => menuRoot.RemoveChild(currentWidget);
 			world.GameOver += removeCurrentWidget;
 
 			// Order Buttons
@@ -127,7 +130,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			var cachedPause = world.PredictedPaused;
 
 			if (button.HideIngameUI)
-				ingameRoot.IsVisible = () => false;
+				worldRoot.IsVisible = () => false;
 
 			if (button.Pause && world.LobbyInfo.IsSinglePlayer)
 				world.SetPauseState(true);
@@ -136,15 +139,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic
 			widgetArgs.Add("onExit", () =>
 			{
 				if (button.HideIngameUI)
-					ingameRoot.IsVisible = () => true;
+					worldRoot.IsVisible = () => true;
 
 				if (button.Pause && world.LobbyInfo.IsSinglePlayer)
 					world.SetPauseState(cachedPause);
 
+				menuRoot.RemoveChild(currentWidget);
 				disableSystemButtons = false;
 			});
 
-			currentWidget = Game.LoadWidget(world, button.MenuContainer, Ui.Root, widgetArgs);
+			currentWidget = Game.LoadWidget(world, button.MenuContainer, menuRoot, widgetArgs);
 		}
 
 		static void BindOrderButton<T>(World world, ButtonWidget w, string icon)

mods/cnc/chrome/ingame-leavemap.yaml

@@ -18,7 +18,7 @@ Container@LEAVE_MAP_WIDGET:
 			Width: WINDOW_RIGHT
 			Height: WINDOW_BOTTOM
 			Background: shellmapborder
-		Container@LEAVE_MAP_SIMPLE
+		Container@LEAVE_MAP_SIMPLE:
 			X: (WINDOW_RIGHT - WIDTH) / 2
 			Y: (WINDOW_BOTTOM - HEIGHT) / 2
 			Width: 370

mods/cnc/chrome/ingame-menu.yaml

@@ -20,6 +20,7 @@ Container@INGAME_MENU:
 			Width: WINDOW_RIGHT
 			Height: WINDOW_BOTTOM
 			Background: shellmapborder
+		Container@PANEL_ROOT:
 		Container@MENU_BUTTONS:
 			X: (WINDOW_RIGHT-WIDTH)/2
 			Y: WINDOW_BOTTOM-33-HEIGHT-10

mods/cnc/chrome/ingame.yaml

@@ -1,5 +1,7 @@
 Container@INGAME_ROOT:
 	Logic: LoadIngamePlayerOrObserverUILogic
+	Children:
+		Container@WORLD_ROOT:
 			Children:
 				LogicTicker@DISCONNECT_WATCHER:
 					Logic: DisconnectWatcherLogic
@@ -55,6 +57,7 @@ Container@INGAME_ROOT:
 					Height: WINDOW_BOTTOM
 					TooltipContainer: TOOLTIP_CONTAINER
 				Container@PLAYER_ROOT:
+		Container@MENU_ROOT:
 		TooltipContainer@TOOLTIP_CONTAINER:
 
 Container@OBSERVER_WIDGETS:

mods/d2k/chrome/ingame-menu.yaml

@@ -9,6 +9,7 @@ Container@INGAME_MENU:
 			Align: Right
 			Font: Regular
 			Contrast: True
+		Container@PANEL_ROOT:
 		Background@MENU_BUTTONS:
 			X: 13 + (WINDOW_RIGHT - 522) / 4 - WIDTH / 2
 			Y: (WINDOW_BOTTOM - HEIGHT)/2

mods/d2k/chrome/ingame-observer.yaml

@@ -1,5 +1,14 @@
 Container@OBSERVER_WIDGETS:
 	Children:
+		MenuButton@OPTIONS_BUTTON:
+			Logic: OrderButtonsChromeLogic
+			X: 0
+			Y: 0
+			Width: 160
+			Height: 25
+			Text: Options (Esc)
+			Font: Bold
+			Key: escape
 		MenuButton@OBSERVER_STATS_BUTTON:
 			Logic: OrderButtonsChromeLogic
 			MenuContainer: INGAME_OBSERVERSTATS_BG

mods/d2k/chrome/ingame-player.yaml

@@ -3,6 +3,15 @@ Container@PLAYER_WIDGETS:
 		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
 			Logic: ControlGroupLogic
 		LogicTicker@SIDEBAR_TICKER:
+		MenuButton@OPTIONS_BUTTON:
+			Logic: OrderButtonsChromeLogic
+			X: 0
+			Y: 0
+			Width: 160
+			Height: 25
+			Text: Options (Esc)
+			Font: Bold
+			Key: escape
 		MenuButton@DIPLOMACY_BUTTON:
 			Logic: OrderButtonsChromeLogic
 			MenuContainer: INGAME_DIPLOMACY_BG

mods/d2k/chrome/ingame.yaml

@@ -1,5 +1,7 @@
 Container@INGAME_ROOT:
 	Logic: IngameChromeLogic
+	Children:
+		Container@WORLD_ROOT:
 			Children:
 				LogicTicker@DISCONNECT_WATCHER:
 					Logic: DisconnectWatcherLogic
@@ -19,25 +21,6 @@ Container@INGAME_ROOT:
 					Y: 0
 					Width: WINDOW_RIGHT
 					Height: WINDOW_BOTTOM
-		Container@GAME_TIMER_BLOCK:
-			Logic: GameTimerLogic
-			X: WINDOW_RIGHT/2 - WIDTH
-			Width: 100
-			Height: 55
-			Children:
-				Label@GAME_TIMER:
-					Width: PARENT_RIGHT
-					Height: 30
-					Align: Center
-					Font: Title
-					Contrast: true
-				Label@GAME_TIMER_STATUS:
-					Y: 32
-					Width: PARENT_RIGHT
-					Height: 15
-					Align: Center
-					Font: Bold
-					Contrast: true
 				StrategicProgress@STRATEGIC_PROGRESS:
 					X: WINDOW_RIGHT/2
 					Y: 40
@@ -46,15 +29,6 @@ Container@INGAME_ROOT:
 					Y: 34
 					Order: Descending
 				Container@PLAYER_ROOT:
-		MenuButton@OPTIONS_BUTTON:
-			Logic: OrderButtonsChromeLogic
-			X: 0
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Options (Esc)
-			Font: Bold
-			Key: escape
 				Container@PERFORMANCE_INFO:
 					Logic: PerfDebugLogic
 					Children:
@@ -77,5 +51,24 @@ Container@INGAME_ROOT:
 									Y: 5
 									Width: 200
 									Height: 200
+				Container@GAME_TIMER_BLOCK:
+					Logic: GameTimerLogic
+					X: WINDOW_RIGHT/2 - WIDTH
+					Width: 100
+					Height: 55
+					Children:
+						Label@GAME_TIMER:
+							Width: PARENT_RIGHT
+							Height: 30
+							Align: Center
+							Font: Title
+							Contrast: true
+						Label@GAME_TIMER_STATUS:
+							Y: 32
+							Width: PARENT_RIGHT
+							Height: 15
+							Align: Center
+							Font: Bold
+							Contrast: true
+		Container@MENU_ROOT:
 		TooltipContainer@TOOLTIP_CONTAINER:
-

mods/ra/chrome/ingame-leavemap.yaml

@@ -20,7 +20,7 @@ Container@LEAVE_MAP_WIDGET:
 			Align: Center
 			Font: Regular
 			Contrast: True
-		Container@LEAVE_MAP_SIMPLE
+		Container@LEAVE_MAP_SIMPLE:
 			X: (WINDOW_RIGHT - WIDTH) / 2
 			Y: (WINDOW_BOTTOM - HEIGHT) / 2
 			Width: 370

mods/ra/chrome/ingame-menu.yaml

@@ -22,6 +22,7 @@ Container@INGAME_MENU:
 			Align: Center
 			Font: Regular
 			Contrast: True
+		Container@PANEL_ROOT:
 		Background@MENU_BUTTONS:
 			X: 13 + (WINDOW_RIGHT - 522) / 4 - WIDTH / 2
 			Y: (WINDOW_BOTTOM - HEIGHT)/2

mods/ra/chrome/ingame.yaml

@@ -1,5 +1,7 @@
 Container@INGAME_ROOT:
 	Logic: LoadIngamePlayerOrObserverUILogic
+	Children:
+		Container@WORLD_ROOT:
 			Children:
 				LogicTicker@DISCONNECT_WATCHER:
 					Logic: DisconnectWatcherLogic
@@ -49,5 +51,5 @@ Container@INGAME_ROOT:
 									Y: 5
 									Width: 200
 									Height: 200
+		Container@MENU_ROOT:
 		TooltipContainer@TOOLTIP_CONTAINER:
-

mods/ts/chrome/ingame-player.yaml

@@ -3,6 +3,16 @@ Container@PLAYER_WIDGETS:
 		LogicKeyListener@CONTROLGROUP_KEYHANDLER:
 			Logic: ControlGroupLogic
 		LogicTicker@SIDEBAR_TICKER:
+		MenuButton@OPTIONS_BUTTON:
+			Logic: OrderButtonsChromeLogic
+			MenuContainer: INGAME_MENU
+			X: 0
+			Y: 0
+			Width: 160
+			Height: 25
+			Text: Options (Esc)
+			Font: Bold
+			Key: escape
 		MenuButton@DIPLOMACY_BUTTON:
 			Logic: OrderButtonsChromeLogic
 			MenuContainer: INGAME_DIPLOMACY_BG

mods/ts/chrome/ingame.yaml

@@ -1,5 +1,7 @@
 Container@INGAME_ROOT:
 	Logic: IngameChromeLogic
+	Children:
+		Container@WORLD_ROOT:
 			Children:
 				LogicTicker@DISCONNECT_WATCHER:
 					Logic: DisconnectWatcherLogic
@@ -19,25 +21,6 @@ Container@INGAME_ROOT:
 					Y: 0
 					Width: WINDOW_RIGHT
 					Height: WINDOW_BOTTOM
-		Container@GAME_TIMER_BLOCK:
-			Logic: GameTimerLogic
-			X: WINDOW_RIGHT/2 - WIDTH
-			Width: 100
-			Height: 55
-			Children:
-				Label@GAME_TIMER:
-					Width: PARENT_RIGHT
-					Height: 15
-					Align: Center
-					Font: Title
-					Contrast: true
-				Label@GAME_TIMER_STATUS:
-					Y: 35
-					Width: PARENT_RIGHT
-					Height: 15
-					Align: Center
-					Font: Bold
-					Contrast: true
 				StrategicProgress@STRATEGIC_PROGRESS:
 					X: WINDOW_RIGHT/2
 					Y: 40
@@ -46,16 +29,6 @@ Container@INGAME_ROOT:
 					Y: 34
 					Order: Descending
 				Container@PLAYER_ROOT:
-		MenuButton@OPTIONS_BUTTON:
-			Logic: OrderButtonsChromeLogic
-			MenuContainer: INGAME_MENU
-			X: 0
-			Y: 0
-			Width: 160
-			Height: 25
-			Text: Options (Esc)
-			Font: Bold
-			Key: escape
 				Container@PERFORMANCE_INFO:
 					Logic: PerfDebugLogic
 					Children:
@@ -78,5 +51,24 @@ Container@INGAME_ROOT:
 									Y: 5
 									Width: 200
 									Height: 200
+				Container@GAME_TIMER_BLOCK:
+					Logic: GameTimerLogic
+					X: WINDOW_RIGHT/2 - WIDTH
+					Width: 100
+					Height: 55
+					Children:
+						Label@GAME_TIMER:
+							Width: PARENT_RIGHT
+							Height: 15
+							Align: Center
+							Font: Title
+							Contrast: true
+						Label@GAME_TIMER_STATUS:
+							Y: 35
+							Width: PARENT_RIGHT
+							Height: 15
+							Align: Center
+							Font: Bold
+							Contrast: true
+		Container@MENU_ROOT:
 		TooltipContainer@TOOLTIP_CONTAINER:
-