Merge pull request #11693 from obrakmann/player-color-contrast

Add contrast to text drawn in player colors
This commit is contained in:
Paul Chote
2016-09-02 20:24:22 +01:00
committed by GitHub
36 changed files with 259 additions and 46 deletions

View File

@@ -128,10 +128,12 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
X: 40
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
Background@THREEBUTTON_PROMPT:
X: (WINDOW_RIGHT - WIDTH)/2

View File

@@ -14,7 +14,7 @@ Container@CHAT_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
RemoveTime: 250
UseContrast: yes
UseShadow: True
Container@CHAT_CHROME:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
@@ -59,9 +59,11 @@ Container@CHAT_PANEL:
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@TEXT:
X: 12
Width: PARENT_RIGHT - 17
Height: 15
WordWrap: true
VAlign: Top
Shadow: True

View File

@@ -88,6 +88,7 @@ Container@SKIRMISH_STATS:
X: 10
Width: 210
Height: 25
Shadow: True
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer: TOOLTIP_CONTAINER
Template: INGAME_CLIENT_TOOLTIP
@@ -103,8 +104,10 @@ Container@SKIRMISH_STATS:
X: 264
Width: 86
Height: 25
Shadow: True
Label@SCORE:
X: 360
Width: 75
Height: 25
Align: Right
Shadow: True

View File

@@ -308,57 +308,67 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@POWER:
X: 395
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@KILLS:
X: 455
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@DEATHS:
X: 515
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_DESTROYED:
X: 575
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_LOST:
X: 655
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EXPERIENCE:
X: 735
Y: 0
Width: 95
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ACTIONS_MIN:
X: 830
Y: 0
Width: 90
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -378,42 +388,50 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_THIS_MIN:
X: 395
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS:
X: 535
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED:
X: 615
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@SPENT:
X: 695
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@HARVESTERS:
X: 775
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -433,6 +451,7 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverProductionIcons@PRODUCTION_ICONS:
X: 215
Y: 0
@@ -462,40 +481,47 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@ASSETS_DESTROYED:
X: 215
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS_LOST:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@UNITS_KILLED:
X: 395
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@UNITS_DEAD:
X: 495
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_KILLED:
X: 615
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_DEAD:
X: 715
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
X: 10
Y: 10

View File

@@ -220,10 +220,12 @@ Container@OBSERVER_WIDGETS:
X: 40
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
Container@PLAYER_WIDGETS:
Children:

View File

@@ -92,17 +92,20 @@ Container@SERVER_LOBBY:
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@NAME:
X: 45
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@TEXT:
X: 55
Width: PARENT_RIGHT - 60
Height: 15
WordWrap: true
VAlign: Top
Shadow: True
TextField@CHAT_TEXTFIELD:
X: 200
Y: PARENT_BOTTOM - HEIGHT

View File

@@ -275,6 +275,7 @@ Container@REPLAYBROWSER_PANEL:
X: 40
Width: PARENT_RIGHT-50
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT

View File

@@ -49,6 +49,7 @@ Background@WORLD_TOOLTIP:
Y: 19
Height: 23
Font: Bold
Shadow: True
Label@EXTRA:
X: 5
Y: 47

View File

@@ -6,7 +6,9 @@ Metrics:
ButtonTextColor: FFFFFF
ButtonTextColorDisabled: 808080
ButtonTextContrast: false
ButtonTextContrastColor: 000000
ButtonTextShadow: false
ButtonTextContrastColorDark: 000000
ButtonTextContrastColorLight: 7F7F7F
ButtonBaseLine: 0
CheckboxPressedState: true
HotkeyFont: Regular
@@ -19,6 +21,8 @@ Metrics:
TextFont: Regular
TextColor: FFFFFF
TextContrast: false
TextContrastColor: 000000
TextShadow: false
TextContrastColorDark: 000000
TextContrastColorLight: 7F7F7F
ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
ColorPickerActorType: ^fact.colorpicker

View File

@@ -90,10 +90,12 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
X: 34
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
ScrollPanel@NEWS_PANEL:
Width: 400

View File

@@ -89,6 +89,7 @@ Container@SKIRMISH_STATS:
X: 10
Width: 210
Height: 25
Shadow: True
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer: TOOLTIP_CONTAINER
Template: INGAME_CLIENT_TOOLTIP
@@ -104,8 +105,10 @@ Container@SKIRMISH_STATS:
X: 264
Width: 86
Height: 25
Shadow: True
Label@SCORE:
X: 360
Width: 75
Height: 25
Align: Right
Shadow: True

View File

@@ -73,10 +73,12 @@ Container@OBSERVER_WIDGETS:
X: 34
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
Container@REPLAY_PLAYER:
Logic: ReplayControlBarLogic
Y: 39

View File

@@ -52,6 +52,7 @@ Background@WORLD_TOOLTIP:
Y: 25
Height: 23
Font: Bold
Shadow: True
Label@EXTRA:
X: 7
Y: 57

View File

@@ -5,7 +5,9 @@ Metrics:
ButtonTextColor: FFFFFF
ButtonTextColorDisabled: 808080
ButtonTextContrast: false
ButtonTextContrastColor: 000000
ButtonTextShadow: false
ButtonTextContrastColorDark: 000000
ButtonTextContrastColorLight: 7F7F7F
ButtonBaseLine: 0
CheckboxPressedState: false
HotkeyFont: Regular
@@ -18,6 +20,8 @@ Metrics:
TextFont: Regular
TextColor: FFFFFF
TextContrast: false
TextContrastColor: 000000
TextShadow: false
TextContrastColorDark: 000000
TextContrastColorLight: 7F7F7F
ColorPickerRemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240
ColorPickerActorType: ^carryall.colorpicker

View File

@@ -6,7 +6,9 @@ Metrics:
ButtonTextColor: FFFFFF
ButtonTextColorDisabled: 808080
ButtonTextContrast: false
ButtonTextContrastColor: 000000
ButtonTextShadow: false
ButtonTextContrastColorDark: 000000
ButtonTextContrastColorLight: 7F7F7F
ButtonBaseLine: 2
CheckboxPressedState: true
HotkeyFont: Regular
@@ -19,5 +21,7 @@ Metrics:
TextFont: Regular
TextColor: FFFFFF
TextContrast: false
TextContrastColor: 000000
ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190
TextShadow: false
TextContrastColorDark: 000000
TextContrastColorLight: 7F7F7F
ColorPickerRemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190

View File

@@ -93,10 +93,12 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
X: 40
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
ScrollPanel@NEWS_PANEL:
Width: 400

View File

@@ -14,7 +14,7 @@ Container@CHAT_PANEL:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
RemoveTime: 250
UseContrast: yes
UseShadow: True
Container@CHAT_CHROME:
Width: PARENT_RIGHT
Height: PARENT_BOTTOM
@@ -55,9 +55,11 @@ Container@CHAT_PANEL:
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@TEXT:
X: 12
Width: PARENT_RIGHT - 17
Height: 15
WordWrap: true
VAlign: Top
Shadow: True

View File

@@ -89,6 +89,7 @@ Container@SKIRMISH_STATS:
X: 10
Width: 210
Height: 25
Shadow: True
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer: TOOLTIP_CONTAINER
Template: INGAME_CLIENT_TOOLTIP
@@ -104,8 +105,10 @@ Container@SKIRMISH_STATS:
X: 264
Width: 86
Height: 25
Shadow: True
Label@SCORE:
X: 360
Width: 75
Height: 25
Align: Right
Shadow: True

View File

@@ -101,10 +101,12 @@ Container@OBSERVER_WIDGETS:
X: 40
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
Image@SIDEBAR_BACKGROUND_BOTTOM:
X: WINDOW_RIGHT - 250
Y: 297

View File

@@ -308,57 +308,67 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@POWER:
X: 395
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@KILLS:
X: 455
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@DEATHS:
X: 515
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_DESTROYED:
X: 575
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_LOST:
X: 655
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EXPERIENCE:
X: 735
Y: 0
Width: 95
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ACTIONS_MIN:
X: 830
Y: 0
Width: 90
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -378,42 +388,50 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_THIS_MIN:
X: 395
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS:
X: 535
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED:
X: 615
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@SPENT:
X: 695
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@HARVESTERS:
X: 775
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -433,6 +451,7 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverProductionIcons@PRODUCTION_ICONS:
X: 215
Y: 0
@@ -462,40 +481,47 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@ASSETS_DESTROYED:
X: 215
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS_LOST:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@UNITS_KILLED:
X: 395
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@UNITS_DEAD:
X: 495
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_KILLED:
X: 615
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_DEAD:
X: 715
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
X: 0
Y: 0

View File

@@ -93,17 +93,20 @@ Background@SERVER_LOBBY:
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@NAME:
X: 45
Width: 50
Height: 15
VAlign: Top
Shadow: True
Label@TEXT:
X: 55
Width: PARENT_RIGHT - 60
Height: 15
WordWrap: true
VAlign: Top
Shadow: True
TextField@CHAT_TEXTFIELD:
X: 205
Y: PARENT_BOTTOM - HEIGHT

View File

@@ -264,6 +264,7 @@ Background@REPLAYBROWSER_PANEL:
X: 40
Width: PARENT_RIGHT-50
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT

View File

@@ -52,6 +52,7 @@ Background@WORLD_TOOLTIP:
Y: 22
Height: 23
Font: Bold
Shadow: True
Label@EXTRA:
X: 7
Y: 50

View File

@@ -6,7 +6,9 @@ Metrics:
ButtonTextColor: FFFFFF
ButtonTextColorDisabled: 808080
ButtonTextContrast: false
ButtonTextContrastColor: 000000
ButtonTextShadow: false
ButtonTextContrastColorDark: 000000
ButtonTextContrastColorLight: 7F7F7F
ButtonBaseLine: 0
CheckboxPressedState: false
HotkeyFont: Regular
@@ -19,7 +21,9 @@ Metrics:
TextFont: Regular
TextColor: FFFFFF
TextContrast: false
TextContrastColor: 000000
TextShadow: false
TextContrastColorDark: 000000
TextContrastColorLight: 7F7F7F
ColorPickerRemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95
ColorPickerActorType: ^fact.colorpicker
FactionSuffix-allies: allies

View File

@@ -90,10 +90,12 @@ ScrollPanel@SPECTATOR_DROPDOWN_TEMPLATE:
X: 40
Width: 60
Height: 25
Shadow: True
Label@NOFLAG_LABEL:
X: 5
Width: PARENT_RIGHT
Height: 25
Shadow: True
ScrollPanel@NEWS_PANEL:
Width: 400

View File

@@ -308,57 +308,67 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@POWER:
X: 395
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@KILLS:
X: 455
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@DEATHS:
X: 515
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_DESTROYED:
X: 575
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ASSETS_LOST:
X: 655
Y: 0
Width: 80
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@EXPERIENCE:
X: 735
Y: 0
Width: 95
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@ACTIONS_MIN:
X: 830
Y: 0
Width: 90
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@ECONOMY_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -378,42 +388,50 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@CASH:
X: 215
Y: 0
Width: 80
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_MIN:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED_THIS_MIN:
X: 395
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS:
X: 535
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@EARNED:
X: 615
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@SPENT:
X: 695
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@HARVESTERS:
X: 775
Y: 0
Width: 60
Height: PARENT_BOTTOM
Align: Right
Shadow: True
ScrollItem@PRODUCTION_PLAYER_TEMPLATE:
X: 0
Y: 0
@@ -433,6 +451,7 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
ObserverProductionIcons@PRODUCTION_ICONS:
X: 215
Y: 0
@@ -464,40 +483,47 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 160
Height: PARENT_BOTTOM
Font: Bold
Shadow: True
Label@ASSETS_DESTROYED:
X: 215
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@ASSETS_LOST:
X: 295
Y: 0
Width: 60
Height: PARENT_BOTTOM
Shadow: True
Label@UNITS_KILLED:
X: 395
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@UNITS_DEAD:
X: 495
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_KILLED:
X: 615
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Label@BUILDINGS_DEAD:
X: 715
Y: 0
Width: 40
Height: PARENT_BOTTOM
Align: Right
Shadow: True
Container@EARNED_THIS_MIN_GRAPH_TEMPLATE:
X: 0
Y: 0

View File

@@ -5,7 +5,9 @@ Metrics:
ButtonTextColor: FFFFFF
ButtonTextColorDisabled: 808080
ButtonTextContrast: false
ButtonTextContrastColor: 000000
ButtonTextShadow: false
ButtonTextContrastColorDark: 000000
ButtonTextContrastColorLight: 7F7F7F
ButtonBaseLine: 0
CheckboxPressedState: false
HotkeyFont: Regular
@@ -18,6 +20,8 @@ Metrics:
TextFont: Regular
TextColor: FFFFFF
TextContrast: false
TextContrastColor: 000000
TextShadow: false
TextContrastColorDark: 000000
TextContrastColorLight: 7F7F7F
ColorPickerRemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
ColorPickerActorType: ^mmch.colorpicker