Merge pull request #8034 from pchote/chrome-logic

Some chrome logic cleanups

mods/ra/chrome/ingame-observer.yaml

@@ -31,7 +31,7 @@ Container@OBSERVER_WIDGETS:
 							Align: Right
 							Font: TinyBold
 				Container@TOP_BUTTONS:
-					Logic: OrderButtonsChromeLogic
+					Logic: MenuButtonsChromeLogic
 					X: 9
 					Y: 7
 					Children:

mods/ra/chrome/ingame-perf.yaml

@@ -0,0 +1,22 @@
+Container@PERF_WIDGETS:
+	Logic: PerfDebugLogic
+	Children:
+		Label@PERF_TEXT:
+			X: WINDOW_RIGHT - 200
+			Y: WINDOW_BOTTOM - 70
+			Width: 170
+			Height: 40
+			Contrast: true
+		Background@GRAPH_BG:
+			ClickThrough: true
+			Background: dialog4
+			X: 30
+			Y: WINDOW_BOTTOM - 240
+			Width: 210
+			Height: 210
+			Children:
+				PerfGraph@GRAPH:
+					X: 5
+					Y: 5
+					Width: 200
+					Height: 200

mods/ra/chrome/ingame-player.yaml

@@ -36,12 +36,12 @@ Container@PLAYER_WIDGETS:
 			ClickThrough: false
 			Children:
 				Container@TOP_BUTTONS:
-					Logic: OrderButtonsChromeLogic
+					Logic: MenuButtonsChromeLogic
 					X: 9
 					Y: 7
 					Children:
 						Button@BEACON_BUTTON:
-							Logic: AddRaceSuffixLogic
+							Logic: BeaconOrderButtonLogic, AddRaceSuffixLogic
 							Width: 28
 							Height: 28
 							Background: sidebar-button
@@ -54,7 +54,7 @@ Container@PLAYER_WIDGETS:
 									Y: 6
 									ImageCollection: order-icons
 						Button@SELL_BUTTON:
-							Logic: AddRaceSuffixLogic
+							Logic: SellOrderButtonLogic, AddRaceSuffixLogic
 							X: 32
 							Width: 28
 							Height: 28
@@ -68,7 +68,7 @@ Container@PLAYER_WIDGETS:
 									Y: 6
 									ImageCollection: order-icons
 						Button@POWER_BUTTON:
-							Logic: AddRaceSuffixLogic
+							Logic: PowerdownOrderButtonLogic, AddRaceSuffixLogic
 							X: 64
 							Width: 28
 							Height: 28
@@ -82,7 +82,7 @@ Container@PLAYER_WIDGETS:
 									Y: 6
 									ImageCollection: order-icons
 						Button@REPAIR_BUTTON:
-							Logic: AddRaceSuffixLogic
+							Logic: RepairOrderButtonLogic, AddRaceSuffixLogic
 							X: 96
 							Width: 28
 							Height: 28

mods/ra/chrome/ingame.yaml

@@ -2,23 +2,18 @@ Container@INGAME_ROOT:
 	Logic: LoadIngamePlayerOrObserverUILogic
 	Children:
 		Container@WORLD_ROOT:
+			Logic: LoadIngamePerfLogic
 			Children:
 				LogicTicker@DISCONNECT_WATCHER:
 					Logic: DisconnectWatcherLogic
 				WorldInteractionController@INTERACTION_CONTROLLER:
-					X: 0
-					Y: 0
 					Width: WINDOW_RIGHT
 					Height: WINDOW_BOTTOM
 				ViewportController:
-					X: 0
-					Y: 0
 					Width: WINDOW_RIGHT
 					Height: WINDOW_BOTTOM
 					TooltipContainer: TOOLTIP_CONTAINER
 				WorldCommand:
-					X: 0
-					Y: 0
 					Width: WINDOW_RIGHT
 					Height: WINDOW_BOTTOM
 				StrategicProgress@STRATEGIC_PROGRESS:
@@ -29,27 +24,6 @@ Container@INGAME_ROOT:
 					Y: 10
 					Order: Descending
 				Container@PLAYER_ROOT:
-				Container@PERFORMANCE_INFO:
-					Logic: PerfDebugLogic
-					Children:
-						Label@PERF_TEXT:
-							X: WINDOW_RIGHT - 200
-							Y: WINDOW_BOTTOM - 70
-							Width: 170
-							Height: 40
-							Contrast: true
-						Background@GRAPH_BG:
-							ClickThrough: true
-							Background: dialog4
-							X: 30
-							Y: WINDOW_BOTTOM - 240
-							Width: 210
-							Height: 210
-							Children:
-								PerfGraph@GRAPH:
-									X: 5
-									Y: 5
-									Width: 200
-									Height: 200
+				Container@PERF_ROOT:
 		Container@MENU_ROOT:
 		TooltipContainer@TOOLTIP_CONTAINER:

mods/ra/mod.yaml

@@ -91,6 +91,7 @@ ChromeLayout:
 	./mods/ra/chrome/ingame-observer.yaml
 	./mods/ra/chrome/ingame-observerstats.yaml
 	./mods/ra/chrome/ingame-player.yaml
+	./mods/ra/chrome/ingame-perf.yaml
 	./mods/ra/chrome/ingame-debug.yaml
 	./mods/ra/chrome/mainmenu.yaml
 	./mods/ra/chrome/settings.yaml