Merge pull request #8034 from pchote/chrome-logic

Some chrome logic cleanups

mods/d2k/chrome/ingame-observer.yaml

@@ -1,16 +1,13 @@
 Container@OBSERVER_WIDGETS:
+	Logic: MenuButtonsChromeLogic
 	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
 			HideIngameUI: False
 			Pause: False

mods/d2k/chrome/ingame-player.yaml

@@ -34,7 +34,7 @@ Container@PLAYER_WIDGETS:
 			ClickThrough: false
 			Children:
 				Container@TOP_BUTTONS:
-					Logic: OrderButtonsChromeLogic
+					Logic: MenuButtonsChromeLogic
 					X: 16
 					Y: 236
 					Children:
@@ -54,6 +54,7 @@ Container@PLAYER_WIDGETS:
 									ImageCollection: order-icons
 									ImageName: debug
 						Button@REPAIR_BUTTON:
+							Logic: RepairOrderButtonLogic
 							X: 29
 							Width: 34
 							Height: 35
@@ -67,6 +68,7 @@ Container@PLAYER_WIDGETS:
 									Y: 0
 									ImageCollection: order-icons
 						Button@SELL_BUTTON:
+							Logic: SellOrderButtonLogic
 							X: 54
 							Width: 34
 							Height: 35
@@ -80,6 +82,7 @@ Container@PLAYER_WIDGETS:
 									Y: 0
 									ImageCollection: order-icons
 						Button@BEACON_BUTTON:
+							Logic: BeaconOrderButtonLogic
 							X: 108
 							Width: 36
 							Height: 35
@@ -94,6 +97,7 @@ Container@PLAYER_WIDGETS:
 									ImageCollection: order-icons
 
 						Button@POWER_BUTTON:
+							Logic: PowerdownOrderButtonLogic
 							X: 133
 							Width: 36
 							Height: 35

mods/d2k/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,28 +24,7 @@ Container@INGAME_ROOT:
 					Y: 34
 					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@GAME_TIMER_BLOCK:
 					Logic: GameTimerLogic
 					X: WINDOW_RIGHT/2 - WIDTH

mods/d2k/mod.yaml

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