Skip to content

Commit 4fa8723

Browse files
committed
RGBA components in XML format instead of HSLA.
1 parent 43b71cd commit 4fa8723

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

ColorSetKit-Test/Colors-XML.colorset

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<dict>
1111
<key>a</key>
1212
<real>0.5</real>
13-
<key>h</key>
14-
<real>0.58333333333333337</real>
15-
<key>l</key>
13+
<key>b</key>
14+
<real>0.58823529411764708</real>
15+
<key>g</key>
1616
<real>0.39215686274509803</real>
17-
<key>s</key>
18-
<real>0.50000000000000011</real>
17+
<key>r</key>
18+
<real>0.19607843137254902</real>
1919
</dict>
2020
<key>lightnesses</key>
2121
<array/>
@@ -26,25 +26,25 @@
2626
<dict>
2727
<key>a</key>
2828
<real>0.75</real>
29-
<key>h</key>
30-
<real>0.083333333333333329</real>
31-
<key>l</key>
29+
<key>b</key>
30+
<real>0.58823529411764708</real>
31+
<key>g</key>
3232
<real>0.78431372549019607</real>
33-
<key>s</key>
34-
<real>0.90909090909090917</real>
33+
<key>r</key>
34+
<real>0.98039215686274506</real>
3535
</dict>
3636
<key>lightnesses</key>
3737
<array/>
3838
<key>variant</key>
3939
<dict>
4040
<key>a</key>
4141
<real>0.25</real>
42-
<key>h</key>
43-
<real>0.75</real>
44-
<key>l</key>
42+
<key>b</key>
43+
<real>0.98039215686274506</real>
44+
<key>g</key>
45+
<real>0.58823529411764708</real>
46+
<key>r</key>
4547
<real>0.78431372549019607</real>
46-
<key>s</key>
47-
<real>0.90909090909090917</real>
4848
</dict>
4949
</dict>
5050
</dict>

ColorSetKit/ColorPair.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,12 @@ import Cocoa
144144
return nil
145145
}
146146

147-
guard let hsl = color.usingColorSpace( .sRGB )?.hsl() else
147+
guard let rgb = color.usingColorSpace( .sRGB )?.rgb() else
148148
{
149149
return nil
150150
}
151151

152-
return [ "h" : hsl.hue, "s" : hsl.saturation, "l" : hsl.lightness, "a" : hsl.alpha ]
152+
return [ "r" : rgb.red, "g" : rgb.green, "b" : rgb.blue, "a" : rgb.alpha ]
153153
}
154154

155155
private func colorFromDictionary( _ dictionary: [ String : Any ]? ) -> NSColor?
@@ -159,15 +159,15 @@ import Cocoa
159159
return nil
160160
}
161161

162-
guard let h = dictionary[ "h" ] as? CGFloat,
163-
let s = dictionary[ "s" ] as? CGFloat,
164-
let l = dictionary[ "l" ] as? CGFloat,
162+
guard let r = dictionary[ "r" ] as? CGFloat,
163+
let g = dictionary[ "g" ] as? CGFloat,
164+
let b = dictionary[ "b" ] as? CGFloat,
165165
let a = dictionary[ "a" ] as? CGFloat
166166
else
167167
{
168168
return nil
169169
}
170170

171-
return NSColor( hue: h, saturation: s, lightness: l, alpha: a )
171+
return NSColor( srgbRed: r, green: g, blue: b, alpha: a )
172172
}
173173
}

0 commit comments

Comments
 (0)