Skip to content

Commit

Permalink
Don't quote fonts that don't need it (#144)
Browse files Browse the repository at this point in the history
  • Loading branch information
cedrickcooke authored Jun 20, 2022
1 parent f997588 commit 3558000
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion kanvas/src/jsMain/kotlin/HtmlKanvas.kt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ private fun shouldFill(paint: Paint): Boolean =
private fun shouldStroke(paint: Paint): Boolean =
paint is Paint.Stroke || paint is Paint.FillAndStroke || paint is Paint.GradientAndStroke

private val WHITESPACE = Regex("\\s")

@Deprecated("This class has been renamed to HtmlKanvas", ReplaceWith("HtmlKanvas", "com.juul.krayon.kanvas.HtmlKanvas"))
public typealias HtmlCanvas = HtmlKanvas

Expand Down Expand Up @@ -277,7 +279,11 @@ public class HtmlKanvas(
Paint.Text.Alignment.Center -> CanvasTextAlign.CENTER
Paint.Text.Alignment.Right -> CanvasTextAlign.RIGHT
}
context.font = "${paint.size}px ${paint.font.names.joinToString { "\"$it\"" }}"
val size = "${paint.size}px"
val name = paint.font.names.joinToString { font ->
if (WHITESPACE in font) "\"$font\"" else font
}
context.font = "$size $name"
}

override fun isPointInPath(transform: Transform, path: Path, x: Float, y: Float): Boolean {
Expand Down

0 comments on commit 3558000

Please sign in to comment.