Merge pull request #3761 from reaperrr/ts-color-crash-fix

Fixes TS mod crash when trying to change color due to missing fact.shp
This commit is contained in:
Matthias Mailänder
2013-08-30 22:03:58 -07:00
3 changed files with 52 additions and 2 deletions

View File

@@ -0,0 +1,43 @@
Background@COLOR_CHOOSER:
Logic:ColorPickerLogic
Background:dialog2
Width:234
Height:105
Children:
Background@HUEBG:
Background:dialog3
X:5
Y:5
Width:148
Height:13
Children:
HueSlider@HUE:
X:2
Y:2
Width:144
Height:9
Ticks:5
Background@MIXERBG:
Background:dialog3
X:5
Y:23
Width:148
Height:76
Children:
ColorMixer@MIXER:
X:2
Y:2
Width:144
Height:72
ShpImage@GTCNST:
X:121
Y:0-68
Image:gtcnstmk
Palette:colorpicker
Button@RANDOM_BUTTON:
Key:tab
X:158
Y:74
Width:70
Height:25
Text:Random

7
mods/ts/metrics.yaml Normal file
View File

@@ -0,0 +1,7 @@
# General dumping-ground for UI element sizes, etc.
Metrics:
ButtonDepth: 1
ButtonFont: Regular
CheckboxPressedState: false
ColorPickerRemapIndices: 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31

View File

@@ -103,7 +103,7 @@ ChromeLayout:
mods/ra/chrome/lobby.yaml
mods/ra/chrome/lobby-playerbin.yaml
mods/ra/chrome/lobby-dialogs.yaml
mods/ra/chrome/color-picker.yaml
mods/ts/chrome/color-picker.yaml
mods/ra/chrome/map-chooser.yaml
mods/ra/chrome/create-server.yaml
mods/ra/chrome/serverbrowser.yaml
@@ -153,7 +153,7 @@ LobbyDefaults:
Fog: true
ChromeMetrics:
mods/ra/metrics.yaml
mods/ts/metrics.yaml
Fonts:
Regular: