From dd0734ff369adc9f0a88d71dea43f09563fc1f38 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 29 Aug 2013 21:53:40 +0200 Subject: [PATCH 1/4] Fixes crash when trying to change color due to missing fact.shp. Note: shp preview doesn't remap properly yet, that seems to require another fix. --- mods/ts/chrome/color-picker.yaml | 43 ++++++++++++++++++++++++++++++++ mods/ts/mod.yaml | 2 +- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 mods/ts/chrome/color-picker.yaml diff --git a/mods/ts/chrome/color-picker.yaml b/mods/ts/chrome/color-picker.yaml new file mode 100644 index 0000000000..e5d69de04c --- /dev/null +++ b/mods/ts/chrome/color-picker.yaml @@ -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:156 + Y:1 + Image:gtcnst + Palette:colorpicker + Button@RANDOM_BUTTON: + Key:tab + X:158 + Y:74 + Width:70 + Height:25 + Text:Random \ No newline at end of file diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 3f07d212d5..4c3bd5232f 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -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 From 9bfb888f8e6374fdeaae9449691d65922bd7e93b Mon Sep 17 00:00:00 2001 From: reaperrr Date: Thu, 29 Aug 2013 22:26:53 +0200 Subject: [PATCH 2/4] Add TS metrics.yaml with TS remap indices for color picker. --- mods/ts/metrics.yaml | 7 +++++++ mods/ts/mod.yaml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 mods/ts/metrics.yaml diff --git a/mods/ts/metrics.yaml b/mods/ts/metrics.yaml new file mode 100644 index 0000000000..c9c34371f2 --- /dev/null +++ b/mods/ts/metrics.yaml @@ -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 diff --git a/mods/ts/mod.yaml b/mods/ts/mod.yaml index 4c3bd5232f..50605b71a6 100644 --- a/mods/ts/mod.yaml +++ b/mods/ts/mod.yaml @@ -153,7 +153,7 @@ LobbyDefaults: Fog: true ChromeMetrics: - mods/ra/metrics.yaml + mods/ts/metrics.yaml Fonts: Regular: From 24e8e0c96a9b0377aed0cfaf8d39fda271137cf1 Mon Sep 17 00:00:00 2001 From: reaperrr Date: Fri, 30 Aug 2013 13:40:21 +0200 Subject: [PATCH 3/4] change color picker preview position as suggested by pchote. --- mods/ts/chrome/color-picker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mods/ts/chrome/color-picker.yaml b/mods/ts/chrome/color-picker.yaml index e5d69de04c..24d11528e5 100644 --- a/mods/ts/chrome/color-picker.yaml +++ b/mods/ts/chrome/color-picker.yaml @@ -30,8 +30,8 @@ Background@COLOR_CHOOSER: Width:144 Height:72 ShpImage@GTCNST: - X:156 - Y:1 + X:121 + Y:0-68 Image:gtcnst Palette:colorpicker Button@RANDOM_BUTTON: From 4dc004c138f30f65873f136bfd2dd1b515fe64ca Mon Sep 17 00:00:00 2001 From: reaperrr Date: Sat, 31 Aug 2013 00:27:44 +0200 Subject: [PATCH 4/4] use first frame of C. Yard make anim for color picker preview. --- mods/ts/chrome/color-picker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ts/chrome/color-picker.yaml b/mods/ts/chrome/color-picker.yaml index 24d11528e5..e7553cd415 100644 --- a/mods/ts/chrome/color-picker.yaml +++ b/mods/ts/chrome/color-picker.yaml @@ -32,7 +32,7 @@ Background@COLOR_CHOOSER: ShpImage@GTCNST: X:121 Y:0-68 - Image:gtcnst + Image:gtcnstmk Palette:colorpicker Button@RANDOM_BUTTON: Key:tab