epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Ingame menu cleanup
This commit is contained in:
Matthias Mailänder
2014-10-18 12:52:17 +02:00
parent 5701162588 ed95247625
commit a9cd2e686c
18 changed files with 316 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ra/chrome/ingame-leavemap.yaml
View File

@@ -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

1
mods/ra/chrome/ingame-menu.yaml
View File

@@ -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

96
mods/ra/chrome/ingame.yaml
View File

@@ -1,53 +1,55 @@
Container@INGAME_ROOT:
Logic: LoadIngamePlayerOrObserverUILogic
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:
X: WINDOW_RIGHT/2
Y: 40
SupportPowerTimer@SUPPORT_POWER_TIMER:
X: 80
Y: 10
Order: Descending
Container@PLAYER_ROOT:
Container@PERFORMANCE_INFO:
Logic: PerfDebugLogic
Container@WORLD_ROOT:
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
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:
X: WINDOW_RIGHT/2
Y: 40
SupportPowerTimer@SUPPORT_POWER_TIMER:
X: 80
Y: 10
Order: Descending
Container@PLAYER_ROOT:
Container@PERFORMANCE_INFO:
Logic: PerfDebugLogic
Children:
PerfGraph@GRAPH:
X: 5
Y: 5
Width: 200
Height: 200
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@MENU_ROOT:
TooltipContainer@TOOLTIP_CONTAINER: