MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Formatting

Browse source
This commit is contained in:
treeform 2022-03-21 19:33:53 -07:00
parent 341b710549
commit 897ca0bc7c
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/pixie/fonts.nim
View file

@ -500,13 +500,12 @@ proc parseSvgFont*(buf: string): Typeface {.raises: [PixieError].} =
result = Typeface() result = Typeface()
result.svgFont = svgfont.parseSvgFont(buf) result.svgFont = svgfont.parseSvgFont(buf)
proc computePaths( proc computePaths(
arrangement: Arrangement arrangement: Arrangement
): seq[Path] = ): seq[Path] =
## Takes an Arrangement and computes Paths for drawing. ## Takes an Arrangement and computes Paths for drawing.
## Returns a seq of paths that match the Spans in the arrangement. ## Returns a seq of paths that match the seq of Spans in the arrangement.
## If you only have one Span you should only get one Path. ## If you only have one Span you will only get one Path.
var line: int var line: int
for spanIndex, (start, stop) in arrangement.spans: for spanIndex, (start, stop) in arrangement.spans:
var spanPath = Path() var spanPath = Path()
@ -551,7 +550,6 @@ proc computePaths(
) )
spanPath.addPath(path) spanPath.addPath(path)
result.add(spanPath) result.add(spanPath)
proc textUber( proc textUber(
@ -565,20 +563,12 @@ proc textUber(
dashes: seq[float32] = @[], dashes: seq[float32] = @[],
stroke: static[bool] = false stroke: static[bool] = false
) = ) =
var line: int
let spanPaths = arrangement.computePaths() let spanPaths = arrangement.computePaths()
for spanIndex, (start, stop) in arrangement.spans: for spanIndex, (start, stop) in arrangement.spans:
let
font = arrangement.fonts[spanIndex]
underlineThickness = font.typeface.underlineThickness * font.scale
underlinePosition = font.typeface.underlinePosition * font.scale
strikeoutThickness = font.typeface.strikeoutThickness * font.scale
strikeoutPosition = font.typeface.strikeoutPosition * font.scale
let path = spanPaths[spanIndex] let path = spanPaths[spanIndex]
when stroke: when stroke:
when type(target) is Image: when type(target) is Image:
let font = arrangement.fonts[spanIndex]
for paint in font.paints: for paint in font.paints:
target.strokePath( target.strokePath(
path, path,
@ -602,6 +592,7 @@ proc textUber(
) )
else: else:
when type(target) is Image: when type(target) is Image:
let font = arrangement.fonts[spanIndex]
for paint in font.paints: for paint in font.paints:
#echo transform #echo transform
target.fillPath(path, paint, transform) target.fillPath(path, paint, transform)