Skip to content

Add sink annotations and use an openarray instead of seq to reduce co… #511

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
treeform merged 1 commit into from
Dec 10, 2022
Merged

Add sink annotations and use an openarray instead of seq to reduce co… #511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/pixie/fonts.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,9 @@ proc copy*(font: Font): Font {.raises: [].} =
result.strikethrough = font.strikethrough
result.noKerningAdjustments = font.noKerningAdjustments

proc newSpan*(text: string, font: Font): Span {.raises: [].} =
proc newSpan*(text: sink string, font: Font): Span {.raises: [].} =
## Creates a span, associating a font with the text.
result = Span()
result.text = text
result.font = font
result = Span(text: text, font: font)

proc convertTextCase(runes: var seq[Rune], textCase: TextCase) =
case textCase:
Expand All @@ -251,7 +249,7 @@ proc canWrap(rune: Rune): bool {.inline.} =
rune == Rune(32) or rune.isWhiteSpace()

proc typeset*(
spans: seq[Span],
spans: openarray[Span],
bounds = vec2(0, 0),
hAlign = LeftAlign,
vAlign = TopAlign,
Expand Down Expand Up @@ -464,7 +462,7 @@ proc typeset*(

proc typeset*(
font: Font,
text: string,
text: sink string,
bounds = vec2(0, 0),
hAlign = LeftAlign,
vAlign = TopAlign,
Expand All @@ -476,7 +474,7 @@ proc typeset*(
## hAlign: horizontal alignment of the text
## vAlign: vertical alignment of the text
## wrap: enable/disable text wrapping
typeset(@[newSpan(text, font)], bounds, hAlign, vAlign, wrap)
typeset([newSpan(text, font)], bounds, hAlign, vAlign, wrap)

proc layoutBounds*(arrangement: Arrangement): Vec2 {.raises: [].} =
## Computes the width and height of the arrangement in pixels.
Expand Down Expand Up @@ -617,7 +615,7 @@ proc fillText*(
proc fillText*(
target: Image,
font: Font,
text: string,
text: sink string,
transform = mat3(),
bounds = vec2(0, 0),
hAlign = LeftAlign,
Expand Down Expand Up @@ -656,7 +654,7 @@ proc strokeText*(
proc strokeText*(
target: Image,
font: Font,
text: string,
text: sink string,
transform = mat3(),
strokeWidth: float32 = 1.0,
bounds = vec2(0, 0),
Expand Down