Merge pull request #246 from guzba/master

font can have mulitple paints but still has simple paint api for 99% …

src/pixie/fonts.nim

@@ -16,7 +16,7 @@ type
     typeface*: Typeface
     size*: float32              ## Font size in pixels.
     lineHeight*: float32 ## The line height in pixels or AutoLineHeight for the font's default line height.
-    paint*: Paint
+    paints*: seq[Paint]
     textCase*: TextCase
     underline*: bool            ## Apply an underline.
     strikethrough*: bool        ## Apply a strikethrough.
@@ -128,6 +128,15 @@ proc defaultLineHeight*(font: Font): float32 {.inline.} =
     font.typeface.ascent - font.typeface.descent + font.typeface.lineGap
   round(fontUnits * font.scale)
 
+proc paint*(font: var Font): var Paint =
+  font.paints[0]
+
+proc paint*(font: Font): lent Paint =
+  font.paints[0]
+
+proc `paint=`*(font: var Font, paint: Paint) =
+  font.paints = @[paint]
+
 proc newSpan*(text: string, font: Font): Span =
   ## Creates a span, associating a font with the text.
   result = Span()
@@ -478,16 +487,17 @@ proc textUber(
 
       when stroke:
         when type(target) is Image:
-          target.strokePath(
+          for paint in font.paints:
-            path,
+            target.strokePath(
-            font.paint,
+              path,
-            transform,
+              paint,
-            strokeWidth,
+              transform,
-            lineCap,
+              strokeWidth,
-            lineJoin,
+              lineCap,
-            miterLimit,
+              lineJoin,
-            dashes
+              miterLimit,
-          )
+              dashes
+            )
         else: # target is Mask
           target.strokePath(
             path,
@@ -500,7 +510,8 @@ proc textUber(
           )
       else:
         when type(target) is Image:
-          target.fillPath(path, font.paint, transform)
+          for paint in font.paints:
+            target.fillPath(path, paint, transform)
         else: # target is Mask
           target.fillPath(path, transform)
 

tests/test_fonts.nim

@@ -970,3 +970,23 @@ block:
   image.fillText(arrangement, vec2(20, 20))
 
   doDiff(image, "spans6")
+
+block:
+  var font = readFont("tests/fonts/Roboto-Regular_1.ttf")
+  font.size = 36
+
+  var paints: seq[Paint]
+  paints.add(rgba(0, 0, 255, 127))
+  paints.add(rgba(255, 0, 0, 127))
+
+  font.paints = paints
+
+  let image = newImage(200, 100)
+  image.fill(rgba(255, 255, 255, 255))
+  image.fillText(
+    font,
+    "Multiple fills",
+    bounds = vec2(200, 0)
+  )
+
+  doDiff(image, "paints1")