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

Rework TS Chrome in preparation for UI scaling.

Browse Source
This commit is contained in:
Paul Chote
2020-01-13 23:21:23 +00:00
committed by abcdefg30
parent f37d9a7010
commit fdc0a6e2b9
8 changed files with 114 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

264
mods/ts/chrome.yaml
View File

@@ -7,9 +7,43 @@
^Buttons: ^Buttons:
Image: buttons.png Image: buttons.png
^Glyphs:
Image: glyphs.png
^LoadScreen: ^LoadScreen:
Image: loadscreen.png Image: loadscreen.png
production-icons:
Inherits: ^Glyphs
Regions:
building: 0, 68, 16, 16
building-disabled: 0, 85, 16, 16
building-alert: 0, 102, 16, 16
defense: 17, 68, 16, 16
defense-disabled: 17, 85, 16, 16
defense-alert: 17, 102, 16, 16
infantry: 34, 68, 16, 16
infantry-disabled: 34, 85, 16, 16
infantry-alert: 34, 102, 16, 16
vehicle: 51, 68, 16, 16
vehicle-disabled: 51, 85, 16, 16
vehicle-alert: 51, 102, 16, 16
air: 68, 68, 16, 16
air-disabled: 68, 85, 16, 16
air-alert: 68, 102, 16, 16
power-icons:
Inherits: ^Glyphs
Regions:
power-normal: 102, 51, 16, 16
power-critical: 119, 51, 16, 16
cash-icons:
Inherits: ^Glyphs
Regions:
cash-normal: 68, 51, 16, 16
cash-critical: 85, 51, 16, 16
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# GDI # GDI
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
@@ -114,25 +148,6 @@ radar-gdi:
Regions: Regions:
insignia: 235, 0, 164, 119 insignia: 235, 0, 164, 119
production-icons-gdi:
Inherits: ^Chrome
Regions:
building: 416, 0, 16, 16
building-disabled: 432, 0, 16, 16
building-alert: 448, 0, 16, 16
defense: 416, 16, 16, 16
defense-disabled: 432, 16, 16, 16
defense-alert: 448, 16, 16, 16
infantry: 416, 32, 16, 16
infantry-disabled: 432, 32, 16, 16
infantry-alert: 448, 32, 16, 16
vehicle: 416, 48, 16, 16
vehicle-disabled: 432, 48, 16, 16
vehicle-alert: 448, 48, 16, 16
air: 416, 64, 16, 16
air-disabled: 432, 64, 16, 16
air-alert: 448, 64, 16, 16
order-icons-gdi: order-icons-gdi:
Inherits: ^Chrome Inherits: ^Chrome
Regions: Regions:
@@ -155,18 +170,6 @@ order-icons-gdi:
power-disabled: 295, 274, 30, 31 power-disabled: 295, 274, 30, 31
power-active: 265, 274, 30, 31 power-active: 265, 274, 30, 31
power-icons-gdi:
Inherits: ^Chrome
Regions:
power-normal: 480, 160, 16, 16
power-critical: 496, 160, 16, 16
cash-icons-gdi:
Inherits: ^Chrome
Regions:
cash-normal: 480, 144, 16, 16
cash-critical: 496, 144, 16, 16
command-icons-gdi: command-icons-gdi:
Inherits: ^Chrome Inherits: ^Chrome
Regions: Regions:
@@ -337,25 +340,6 @@ radar-nod:
Regions: Regions:
insignia: 747, 0, 164, 119 insignia: 747, 0, 164, 119
production-icons-nod:
Inherits: ^Chrome
Regions:
building: 928, 0, 16, 16
building-disabled: 944, 0, 16, 16
building-alert: 960, 0, 16, 16
defense: 928, 16, 16, 16
defense-disabled: 944, 16, 16, 16
defense-alert: 960, 16, 16, 16
infantry: 928, 32, 16, 16
infantry-disabled: 944, 32, 16, 16
infantry-alert: 960, 32, 16, 16
vehicle: 928, 48, 16, 16
vehicle-disabled: 944, 48, 16, 16
vehicle-alert: 960, 48, 16, 16
air: 928, 64, 16, 16
air-disabled: 944, 64, 16, 16
air-alert: 960, 64, 16, 16
order-icons-nod: order-icons-nod:
Inherits: ^Chrome Inherits: ^Chrome
Regions: Regions:
@@ -381,18 +365,6 @@ order-icons-nod:
diplomacy-disabled: 807, 305, 30, 31 diplomacy-disabled: 807, 305, 30, 31
diplomacy-active: 777, 305, 30, 31 diplomacy-active: 777, 305, 30, 31
power-icons-nod:
Inherits: ^Chrome
Regions:
power-normal: 992, 160, 16, 16
power-critical: 1008, 160, 16, 16
cash-icons-nod:
Inherits: ^Chrome
Regions:
cash-normal: 992, 144, 16, 16
cash-critical: 1008, 144, 16, 16
command-icons-nod: command-icons-nod:
Inherits: ^Chrome Inherits: ^Chrome
Regions: Regions:
@@ -465,81 +437,78 @@ stance-icons-nod:
# GENERIC # GENERIC
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# make this paragraph AddFactionSuffixLogic compatible
sidebar-bits: sidebar-bits:
Inherits: ^Chrome Inherits: ^Glyphs
Regions: Regions:
production-tooltip-time: 464, 128, 16, 16 production-tooltip-time: 136, 51, 16, 16
production-tooltip-power: 480, 160, 16, 16 production-tooltip-power: 102, 51, 16, 16
production-tooltip-cost: 480, 144, 16, 16 production-tooltip-cost: 68, 51, 16, 16
indicator-muted: 0, 119, 24, 24
scrollbar:
Inherits: ^Buttons
Regions:
down_arrow: 16, 140, 16, 16
down_pressed: 16, 140, 16, 16
up_arrow: 32, 140, 16, 16
up_pressed: 32, 140, 16, 16
flags: flags:
Inherits: ^Buttons Inherits: ^Glyphs
Regions: Regions:
gdi: 30, 112, 30, 15 gdi: 226, 209, 30, 15
nod: 0, 112, 30, 15 nod: 226, 225, 30, 15
Random: 60, 112, 30, 15 Random: 226, 241, 30, 15
spectator: 60, 112, 30, 15 spectator: 226, 241, 30, 15
lobby-bits: lobby-bits:
Inherits: ^Buttons Inherits: ^Glyphs
Regions: Regions:
spawn-unclaimed: 159, 5, 23, 22 spawn-unclaimed: 91, 119, 22, 22
spawn-claimed: 127, 5, 23, 22 spawn-claimed: 68, 119, 22, 22
admin: 187, 5, 7, 5 admin: 170, 0, 6, 5
colorpicker: 127, 5, 23, 22 colorpicker: 68, 119, 22, 22
huepicker: 194, 0, 7, 15 huepicker: 136, 0, 7, 15
protected: 202, 0, 10, 13 kick: 153, 0, 11, 11
protected-disabled: 213, 0, 10, 13 protected: 0, 17, 12, 13
authentication: 199, 16, 12, 13 protected-disabled: 17, 17, 12, 13
authentication-disabled: 212, 16, 12, 13 authentication: 34, 17, 12, 13
admin-registered: 224, 0, 16, 16 authentication-disabled: 51, 17, 12, 13
admin-anonymous: 240, 0, 16, 16 admin-registered: 0, 51, 16, 16
player-registered: 224, 16, 16, 16 admin-anonymous: 34, 51, 16, 16
player-anonymous: 240, 16, 16, 16 player-registered: 17, 51, 16, 16
player-anonymous: 51, 51, 16, 16
reload-icon: reload-icon:
Inherits: ^Dialog Inherits: ^Glyphs
Regions: Regions:
enabled: 160, 480, 16, 16 enabled: 0, 34, 16, 16
disabled-0: 176, 480, 16, 16 disabled-0: 17, 34, 16, 16
disabled-1: 192, 480, 16, 16 disabled-1: 34, 34, 16, 16
disabled-2: 208, 480, 16, 16 disabled-2: 51, 34, 16, 16
disabled-3: 224, 480, 16, 16 disabled-3: 68, 34, 16, 16
disabled-4: 240, 480, 16, 16 disabled-4: 85, 34, 16, 16
disabled-5: 256, 480, 16, 16 disabled-5: 102, 34, 16, 16
disabled-6: 272, 480, 16, 16 disabled-6: 119, 34, 16, 16
disabled-7: 288, 480, 16, 16 disabled-7: 136, 34, 16, 16
disabled-8: 304, 480, 16, 16 disabled-8: 153, 34, 16, 16
disabled-9: 320, 480, 16, 16 disabled-9: 170, 34, 16, 16
disabled-10: 336, 480, 16, 16 disabled-10: 187, 34, 16, 16
disabled-11: 352, 480, 16, 16 disabled-11: 204, 34, 16, 16
strategic:
Inherits: ^Buttons
Regions:
unowned: 127, 5, 23, 22
critical_unowned: 127, 27, 23, 22
enemy_owned: 159, 27, 23, 22
player_owned: 159, 49, 23, 22
music: music:
Inherits: ^Buttons Inherits: ^Glyphs
Regions: Regions:
pause: 5, 198, 16, 16 pause: 0, 0, 16, 16
stop: 30, 198, 16, 16 stop: 17, 0, 16, 16
play: 59, 198, 16, 16 play: 34, 0, 16, 16
next: 87, 198, 16, 16 next: 51, 0, 16, 16
prev: 114, 198, 16, 16 prev: 68, 0, 16, 16
fastforward: 138, 198, 16, 16 fastforward: 85, 0, 16, 16
scrollbar:
Inherits: ^Glyphs
Regions:
down_arrow: 68, 17, 16, 16
down_pressed: 85, 17, 16, 16
up_arrow: 102, 17, 16, 16
up_pressed: 119, 17, 16, 16
right_arrow: 136, 17, 16, 16
right_pressed: 153, 17, 16, 16
left_arrow: 170, 17, 16, 16
left_pressed: 187, 17, 16, 16
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Other UI stuff # Other UI stuff
@@ -549,11 +518,11 @@ music:
dialog: dialog:
Inherits: ^Dialog Inherits: ^Dialog
Regions: Regions:
background: 0, 0, 480, 480 background: 1, 1, 478, 478
border-r: 483, 0, 9, 153 border-r: 483, 1, 9, 151
border-l: 481, 0, 9, 153 border-l: 481, 1, 9, 151
border-b: 0, 483, 153, 9 border-b: 1, 483, 151, 9
border-t: 0, 481, 153, 9 border-t: 1, 481, 151, 9
corner-tl: 393, 481, 21, 21 corner-tl: 393, 481, 21, 21
corner-tr: 415, 481, 21, 21 corner-tr: 415, 481, 21, 21
corner-bl: 437, 481, 21, 21 corner-bl: 437, 481, 21, 21
@@ -578,30 +547,30 @@ progressbar-thumb:
button: button:
Inherits: ^Dialog Inherits: ^Dialog
PanelRegion: 512, 0, 1, 1, 126, 126, 1, 1 PanelRegion: 513, 1, 2, 2, 122, 122, 2, 2
button-hover: button-hover:
Inherits: ^Dialog Inherits: ^Dialog
PanelRegion: 512, 128, 1, 1, 126, 126, 1, 1 PanelRegion: 513, 129, 2, 2, 122, 122, 2, 2
button-pressed: button-pressed:
Inherits: ^Dialog Inherits: ^Dialog
PanelRegion: 640, 0, 1, 1, 126, 126, 1, 1 PanelRegion: 641, 1, 2, 2, 122, 122, 2, 2
button-disabled: button-disabled:
Inherits: ^Dialog Inherits: ^Dialog
PanelRegion: 512, 256, 1, 1, 126, 126, 1, 1 PanelRegion: 513, 257, 2, 2, 122, 122, 2, 2
button-highlighted: button-highlighted:
Inherits: ^Dialog Inherits: ^Dialog
PanelRegion: 768, 128, 1, 1, 126, 126, 1, 1 PanelRegion: 769, 129, 2, 2, 122, 122, 2, 2
button-highlighted-hover: button-highlighted-hover:
Inherits: button-highlighted Inherits: button-highlighted
button-highlighted-pressed: button-highlighted-pressed:
Inherits: ^Dialog Inherits: ^Dialog
PanelRegion: 896, 128, 1, 1, 126, 126, 1, 1 PanelRegion: 897, 129, 2, 2, 122, 122, 2, 2
button-highlighted-disabled: button-highlighted-disabled:
Inherits: button-highlighted Inherits: button-highlighted
@@ -614,7 +583,7 @@ newsbutton-hover:
newsbutton-highlighted: newsbutton-highlighted:
Inherits: ^Dialog Inherits: ^Dialog
PanelRegion: 768, 0, 1, 1, 126, 126, 1, 1 PanelRegion: 769, 1, 2, 2, 122, 122, 2, 2
newsbutton-highlighted-hover: newsbutton-highlighted-hover:
Inherits: newsbutton-highlighted Inherits: newsbutton-highlighted
@@ -655,7 +624,7 @@ scrollpanel-button-disabled:
slider: slider:
Inherits: ^Dialog Inherits: ^Dialog
Regions: Regions:
tick: 512, 1, 1, 4 tick: 513, 1, 1, 4
slider-track: slider-track:
Inherits: button-pressed Inherits: button-pressed
@@ -676,24 +645,24 @@ checkbox:
Inherits: button-pressed Inherits: button-pressed
checkbox-bits: checkbox-bits:
Inherits: ^Buttons Inherits: ^Glyphs
Regions: Regions:
checked: 0, 157, 16, 16 checked: 187, 0, 16, 16
checked-disabled: 0, 173, 16, 16 checked-disabled: 204, 0, 16, 16
crossed: 16, 157, 16, 16 crossed: 221, 0, 16, 16
crossed-disabled: 16, 173, 16, 16 crossed-disabled: 238, 0, 16, 16
checkbox-hover: checkbox-hover:
Inherits: ^Dialog Inherits: ^Dialog
PanelRegion: 640, 128, 1, 1, 126, 126, 1, 1 PanelRegion: 641, 129, 2, 2, 122, 122, 2, 2
checkbox-disabled: checkbox-disabled:
Inherits: ^Dialog Inherits: ^Dialog
PanelRegion: 640, 256, 1, 1, 126, 126, 1, 1 PanelRegion: 641, 257, 2, 2, 122, 122, 2, 2
checkbox-highlighted: checkbox-highlighted:
Inherits: ^Dialog Inherits: ^Dialog
PanelRegion: 896, 0, 1, 1, 126, 126, 1, 1 PanelRegion: 897, 1, 2, 2, 122, 122, 2, 2
scrollitem-selected: scrollitem-selected:
Inherits: button-pressed Inherits: button-pressed
@@ -707,18 +676,13 @@ scrollitem-nohover:
scrollheader-selected: scrollheader-selected:
Inherits: button Inherits: button
logos:
Inherits: ^LoadScreen
Regions:
logo: 0, 0, 256, 256
mainmenu-border: mainmenu-border:
Inherits: ^Dialog Inherits: ^Dialog
dropdown: dropdown:
Inherits: ^Dialog Inherits: ^Dialog
Regions: Regions:
separator: 512, 1, 1, 19 separator: 513, 1, 1, 19
logos: logos:
Inherits: ^LoadScreen Inherits: ^LoadScreen

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

@@ -279,24 +279,6 @@ Container@PLAYER_WIDGETS:
X: 0 X: 0
Y: 21 Y: 21
Children: Children:
MenuButton@DEBUG_BUTTON:
Logic: AddFactionSuffixLogic
Key: escape Shift
X: 13
Width: 30
Height: 31
Background: sidebar-button
TooltipText: Debug Menu
TooltipContainer: TOOLTIP_CONTAINER
DisableWorldSounds: true
VisualHeight: 0
Children:
Image@ICON:
Logic: AddFactionSuffixLogic
X: 0
Y: 0
ImageCollection: order-icons
ImageName: debug
Button@REPAIR_BUTTON: Button@REPAIR_BUTTON:
Logic: RepairOrderButtonLogic, AddFactionSuffixLogic Logic: RepairOrderButtonLogic, AddFactionSuffixLogic
X: 43 X: 43
@@ -428,7 +410,6 @@ Container@PLAYER_WIDGETS:
TooltipTemplate: SIMPLE_TOOLTIP TooltipTemplate: SIMPLE_TOOLTIP
Children: Children:
Image@CASH_ICON: Image@CASH_ICON:
Logic: AddFactionSuffixLogic
X: 0 - 17 X: 0 - 17
Y: 3 Y: 3
ImageCollection: cash-icons ImageCollection: cash-icons
@@ -446,7 +427,6 @@ Container@PLAYER_WIDGETS:
TooltipTemplate: SIMPLE_TOOLTIP TooltipTemplate: SIMPLE_TOOLTIP
Children: Children:
Image@POWER_ICON: Image@POWER_ICON:
Logic: AddFactionSuffixLogic
X: PARENT_RIGHT + 0 X: PARENT_RIGHT + 0
Y: 3 Y: 3
ImageCollection: power-icons ImageCollection: power-icons
@@ -511,7 +491,6 @@ Container@PLAYER_WIDGETS:
Key: ProductionTypeBuilding Key: ProductionTypeBuilding
Children: Children:
Image@ICON: Image@ICON:
Logic: AddFactionSuffixLogic
X: 7 X: 7
Y: 7 Y: 7
ImageCollection: production-icons ImageCollection: production-icons
@@ -529,7 +508,6 @@ Container@PLAYER_WIDGETS:
Key: ProductionTypeDefense Key: ProductionTypeDefense
Children: Children:
Image@ICON: Image@ICON:
Logic: AddFactionSuffixLogic
X: 7 X: 7
Y: 7 Y: 7
ImageCollection: production-icons ImageCollection: production-icons
@@ -547,7 +525,6 @@ Container@PLAYER_WIDGETS:
Key: ProductionTypeInfantry Key: ProductionTypeInfantry
Children: Children:
Image@ICON: Image@ICON:
Logic: AddFactionSuffixLogic
X: 6 X: 6
Y: 7 Y: 7
ImageCollection: production-icons ImageCollection: production-icons
@@ -565,7 +542,6 @@ Container@PLAYER_WIDGETS:
Key: ProductionTypeVehicle Key: ProductionTypeVehicle
Children: Children:
Image@ICON: Image@ICON:
Logic: AddFactionSuffixLogic
X: 7 X: 7
Y: 7 Y: 7
ImageCollection: production-icons ImageCollection: production-icons
@@ -583,7 +559,6 @@ Container@PLAYER_WIDGETS:
Key: ProductionTypeAircraft Key: ProductionTypeAircraft
Children: Children:
Image@ICON: Image@ICON:
Logic: AddFactionSuffixLogic
X: 7 X: 7
Y: 7 Y: 7
ImageCollection: production-icons ImageCollection: production-icons

BIN
mods/ts/uibits/buttons.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
mods/ts/uibits/dialog.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 230 KiB

After

Width:  |  Height:  |  Size: 233 KiB

BIN
mods/ts/uibits/glyphs-2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
mods/ts/uibits/glyphs-3x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 76 KiB

BIN
mods/ts/uibits/glyphs.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
mods/ts/uibits/loadscreen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 46 KiB