Implement the new color picker.

This commit is contained in:
Paul Chote
2013-04-27 01:28:35 +12:00
parent e240b9ca3d
commit 70f705bdc7
13 changed files with 162 additions and 235 deletions

View File

@@ -390,6 +390,8 @@ lobby-bits: chrome.png
spawn-claimed: 256,32,16,16
spawn-unclaimed: 256,48,16,16
admin: 340,39,7,5
colorpicker: 256,32,16,16
huepicker: 388,96,7,15
checkbox-bits: chrome.png
checked: 272,32,16,16

View File

@@ -1,71 +1,46 @@
Background@COLOR_CHOOSER:
Logic:ColorPickerLogic
Background:panel-black
Width:315
Height:130
Width:234
Height:105
Children:
Button@SAVE_BUTTON:
Key:return
X:210
Y:90
Width:90
Height:25
Text:Save
Button@RANDOM_BUTTON:
X:15
Y:90
Width:90
Height:25
Text:Random
ShpImage@FACT:
X:220
Y:15
Image:fact
Palette:colorpicker
Label@HUE_LABEL:
Background@HUEBG:
Background:panel-black
X:5
Y:5
Width:40
Height:20
Align:Right
Text:Hue:
Font:Bold
Slider@HUE:
X:43
Y:10
Width:160
Height:20
Ticks:5
Label@SAT_LABEL:
Width:148
Height:13
Children:
HueSlider@HUE:
X:2
Y:2
Width:144
Height:9
Ticks:5
Background@MIXERBG:
Background:panel-black
X:5
Y:30
Width:40
Height:20
Align:Right
Text:Sat:
Font:Bold
Slider@SAT:
X:43
Y:35
Width:160
Height:20
Ticks:5
Label@LUM_LABEL:
X:5
Y:55
Width:40
Height:20
Align:Right
Text:Lum:
Font:Bold
Slider@LUM:
X:43
Y:60
Width:160
Height:20
Ticks:5
MinimumValue: 0.2
MaximumValue: 1
Y:23
Width:148
Height:76
Children:
ColorMixer@MIXER:
X:2
Y:2
Width:144
Height:72
ShpImage@FACT:
X:160
Y:13
Image:fact
Palette:colorpicker
Button@RANDOM_BUTTON:
Key:tab
X:158
Y:74
Width:70
Height:25
Text:Random
ScrollPanel@LABEL_DROPDOWN_TEMPLATE:
Width:DROPDOWN_WIDTH

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

View File

@@ -240,6 +240,8 @@ lobby-bits: spawnpoints.png
spawn-unclaimed: 528,128,16,16
spawn-claimed: 512,128,16,16
admin: 37,5,7,5
colorpicker: 512,128,16,16
huepicker: 45,0,7,15
strategic: strategic.png
unowned: 0,0,32,32

View File

@@ -1,66 +1,44 @@
Background@COLOR_CHOOSER:
Logic:ColorPickerLogic
Background:dialog2
Width:310
Height:120
Width:234
Height:105
Children:
Button@SAVE_BUTTON:
X:210
Y:85
Width:90
Height:25
Text:Save
Font:Bold
Button@RANDOM_BUTTON:
X:115
Y:85
Width:90
Height:25
Text:Random
Font:Bold
ShpImage@CARRYALL:
X:220
Y:10
Image:carryall
Palette:colorpicker
Label@HUE_LABEL:
X:0
Background@HUEBG:
Background:dialog3
X:5
Y:5
Width:40
Height:20
Align: Right
Text: Hue:
Slider@HUE:
X:43
Y:10
Width:160
Height:20
Ticks:5
Label@SAT_LABEL:
X:0
Y:30
Width:40
Height:20
Align: Right
Text: Sat:
Slider@SAT:
X:43
Y:35
Width:160
Height:20
Ticks:5
Label@LUM_LABEL:
X:0
Y:55
Width:40
Height:20
Align: Right
Text: Lum:
Slider@LUM:
X:43
Y:60
Width:160
Height:20
Ticks:5
MinimumValue: 0.2
MaximumValue: 1
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@FACT:
X:160
Y:8
Image:carryall
Frame:13
Palette:colorpicker
Button@RANDOM_BUTTON:
Key:tab
X:158
Y:74
Width:70
Height:25
Text:Random

View File

@@ -173,6 +173,8 @@ lobby-bits: spawnpoints.png
spawn-unclaimed: 528,128,16,16
spawn-claimed: 512,128,16,16
admin: 37,5,7,5
colorpicker: 512,128,16,16
huepicker: 45,0,7,15
strategic: strategic.png
unowned: 0,0,32,32

View File

@@ -1,66 +1,43 @@
Background@COLOR_CHOOSER:
Logic:ColorPickerLogic
Background:dialog2
Width:310
Height:120
Width:234
Height:105
Children:
Button@SAVE_BUTTON:
X:210
Y:85
Width:90
Height:25
Text:Save
Font:Bold
Button@RANDOM_BUTTON:
X:115
Y:85
Width:90
Height:25
Text:Random
Font:Bold
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@FACT:
X:220
Y:10
X:156
Y:1
Image:fact
Palette:colorpicker
Label@HUE_LABEL:
X:0
Y:5
Width:40
Height:20
Align: Right
Text: Hue:
Slider@HUE:
X:43
Y:10
Width:160
Height:20
Ticks:5
Label@SAT_LABEL:
X:0
Y:30
Width:40
Height:20
Align: Right
Text: Sat:
Slider@SAT:
X:43
Y:35
Width:160
Height:20
Ticks:5
Label@LUM_LABEL:
X:0
Y:55
Width:40
Height:20
Align: Right
Text: Lum:
Slider@LUM:
X:43
Y:60
Width:160
Height:20
Ticks:5
MinimumValue: 0.2
MaximumValue: 1
Button@RANDOM_BUTTON:
Key:tab
X:158
Y:74
Width:70
Height:25
Text:Random

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB