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

Merge pull request #8034 from pchote/chrome-logic

Browse Source 
Some chrome logic cleanups
This commit is contained in:
Oliver Brakmann
2015-04-26 22:19:28 +02:00
parent a6b8bdf978 e0ac3df373
commit d6963567d9
17 changed files with 268 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
mods/cnc/chrome/ingame.yaml
View File

@@ -2,6 +2,7 @@ Container@INGAME_ROOT:
Logic: LoadIngamePlayerOrObserverUILogic
Children:
Container@WORLD_ROOT:
Logic: LoadIngamePerfLogic
Children:
LogicTicker@DISCONNECT_WATCHER:
Logic: DisconnectWatcherLogic
@@ -27,28 +28,7 @@ Container@INGAME_ROOT:
StrategicProgress@STRATEGIC_PROGRESS:
X: WINDOW_RIGHT/2
Y: 40
Container@PERFORMANCE_INFO:
Logic: PerfDebugLogic
Children:
Label@PERF_TEXT:
X: WINDOW_RIGHT - 200
Y: WINDOW_BOTTOM - 70
Width: 170
Height: 40
Contrast: true
VAlign: Top
Background@GRAPH_BG:
X: 10
Y: WINDOW_BOTTOM-HEIGHT-10
Width: 220
Height: 220
Background: panel-black
Children:
PerfGraph@GRAPH:
X: 10
Y: 10
Width: 200
Height: 200
Container@PERF_ROOT:
WorldInteractionController@INTERACTION_CONTROLLER:
Width: WINDOW_RIGHT
Height: WINDOW_BOTTOM
@@ -60,8 +40,31 @@ Container@INGAME_ROOT:
Container@MENU_ROOT:
TooltipContainer@TOOLTIP_CONTAINER:
Container@PERF_WIDGETS:
Logic: PerfDebugLogic
Children:
Label@PERF_TEXT:
X: WINDOW_RIGHT - 200
Y: WINDOW_BOTTOM - 70
Width: 170
Height: 40
Contrast: true
VAlign: Top
Background@GRAPH_BG:
X: 10
Y: WINDOW_BOTTOM-HEIGHT-10
Width: 220
Height: 220
Background: panel-black
Children:
PerfGraph@GRAPH:
X: 10
Y: 10
Width: 200
Height: 200
Container@OBSERVER_WIDGETS:
Logic: OrderButtonsChromeLogic
Logic: MenuButtonsChromeLogic
Children:
MenuButton@OPTIONS_BUTTON:
Key: escape
@@ -237,7 +240,7 @@ Container@PLAYER_WIDGETS:
ReadyText: Ready
HoldText: On Hold
Background@SIDEBAR_BACKGROUND:
Logic: OrderButtonsChromeLogic
Logic: MenuButtonsChromeLogic
X: WINDOW_RIGHT - 204
Y: 30
Width: 194
@@ -260,6 +263,7 @@ Container@PLAYER_WIDGETS:
ImageCollection: order-icons
ImageName: options
Button@BEACON_BUTTON:
Logic: BeaconOrderButtonLogic
X: 62
Y: 0-24
Width: 30
@@ -273,6 +277,7 @@ Container@PLAYER_WIDGETS:
Y: 5
ImageCollection: order-icons
Button@SELL_BUTTON:
Logic: SellOrderButtonLogic
X: 102
Y: 0-24
Width: 30
@@ -286,6 +291,7 @@ Container@PLAYER_WIDGETS:
Y: 5
ImageCollection: order-icons
Button@REPAIR_BUTTON:
Logic: RepairOrderButtonLogic
X: 142
Y: 0-24
Width: 30

5
mods/d2k/chrome/ingame-observer.yaml
View File

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

6
mods/d2k/chrome/ingame-player.yaml
View File

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

30
mods/d2k/chrome/ingame.yaml
View File

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

1
mods/d2k/mod.yaml
View File

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

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

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

22
mods/ra/chrome/ingame-perf.yaml Normal file
View File

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

10
mods/ra/chrome/ingame-player.yaml
View File

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

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

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

1
mods/ra/mod.yaml
View File

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

10
mods/ts/chrome/ingame-player.yaml
View File

@@ -36,7 +36,7 @@ Container@PLAYER_WIDGETS:
ClickThrough: false
Children:
Container@TOP_BUTTONS:
Logic: OrderButtonsChromeLogic
Logic: MenuButtonsChromeLogic
X: 0
Y: 21
Children:
@@ -58,7 +58,7 @@ Container@PLAYER_WIDGETS:
ImageCollection: order-icons
ImageName: debug
Button@REPAIR_BUTTON:
Logic: AddRaceSuffixLogic
Logic: RepairOrderButtonLogic, AddRaceSuffixLogic
X: 43
Width: 30
Height: 31
@@ -73,7 +73,7 @@ Container@PLAYER_WIDGETS:
Y: 0
ImageCollection: order-icons
Button@SELL_BUTTON:
Logic: AddRaceSuffixLogic
Logic: SellOrderButtonLogic, AddRaceSuffixLogic
X: 73
Width: 30
Height: 31
@@ -88,7 +88,7 @@ Container@PLAYER_WIDGETS:
Y: 0
ImageCollection: order-icons
Button@BEACON_BUTTON:
Logic: AddRaceSuffixLogic
Logic: BeaconOrderButtonLogic, AddRaceSuffixLogic
X: 103
Width: 30
Height: 31
@@ -103,7 +103,7 @@ Container@PLAYER_WIDGETS:
Y: 0
ImageCollection: order-icons
Button@POWER_BUTTON:
Logic: AddRaceSuffixLogic
Logic: PowerdownOrderButtonLogic, AddRaceSuffixLogic
X: 133
Width: 30
Height: 31

1
mods/ts/mod.yaml
View File

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