git.iko.soy/elk
on master help sign in
Move LineStyle into Collage.
e9d2288evancz
libraries/Graphics/Collage.elm+28
compare with master
unifiedsplit
@@ -7,6 +7,7 @@ import Graphics.Geometry
7import Native.Graphics.Matrix as Matrix
7import Native.Graphics.Matrix as Matrix
8import Native.Graphics.Collage as N
8import Native.Graphics.Collage as N
9import Graphics.Element
9import Graphics.Element
10+import Graphics.Color as Color
10
11
11type Form = {
12type Form = {
12 theta : Float,
13 theta : Float,
@@ -21,6 +22,33 @@ data FillStyle
21 | Texture String
22 | Texture String
22 | Gradient Gradient
23 | Gradient Gradient
23
24
25+data LineCap = Butt | Round | Square
26+data LineJoin = Smooth | Sharp | Clipped
27+
28+type LineStyle = {
29+ color : Color,
30+ width : Float,
31+ cap : LineCap,
32+ join : LineJoin,
33+ miterLimit : Float,
34+ dashing : [Int],
35+ dashOffset : Int
36+ }
37+
38+defaultLine = {
39+ color = Color.black,
40+ width = 1,
41+ cap = Butt,
42+ join = Sharp,
43+ dashing = [],
44+ dashOffset = 0,
45+ miterLimit = 10
46+ }
47+
48+solid clr = { basic | color <- clr }
49+dashed clr = { basic | color <- clr, dashing <- [8,4] }
50+dotted clr = { basic | color <- clr, dashing <- [3,3] }
51+
24data BasicForm
52data BasicForm
25 = FPath LineStyle Path
53 = FPath LineStyle Path
26 | FShape (Either LineStyle FillStyle) Shape
54 | FShape (Either LineStyle FillStyle) Shape
libraries/Graphics/LineStyle.elmdeleted−31
@@ -1,31 +0,0 @@
1−
2−module Graphics.LineStyle where
3−
4−import Graphics.Color as Color
5−
6−data LineCap = Butt | Round | Square
7−data LineJoin = Smooth | Sharp | Clipped
8−
9−type LineStyle = {
10− color : Color,
11− width : Float,
12− cap : LineCap,
13− join : LineJoin,
14− miterLimit : Float,
15− dashing : [Int],
16− dashOffset : Int
17− }
18−
19−basic = {
20− color = Color.black,
21− width = 1,
22− cap = Butt,
23− join = Sharp,
24− dashing = [],
25− dashOffset = 0,
26− miterLimit = 10
27− }
28−
29−solid clr = { basic | color <- clr }
30−dashed clr = { basic | color <- clr, dashing <- [8,4] }
31−dotted clr = { basic | color <- clr, dashing <- [3,3] }