fix text-align; bump 0.0.16

Quamolit · Nov 20, 2020 · 8cc4bb1 · 8cc4bb1
1 parent ed1de4d
commit 8cc4bb1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 ### Usage
 
 ```nim
-requires "https://github.com/Quamolit/json-paint.nim#v0.0.12"
+requires "https://github.com/Quamolit/json-paint.nim#v0.0.16"
 ```
 
 ```nim

diff --git a/json_paint.nimble b/json_paint.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.0.15"
+version       = "0.0.16"
 author        = "jiyinyiyong"
 description   = "JSON DSL for canvas rendering"
 license       = "MIT"

diff --git a/src/json_paint.nim b/src/json_paint.nim
@@ -52,6 +52,7 @@ proc renderCanvas*(tree: JsonNode) =
   let base = TreeContext(x: 0, y: 0)
   resetTouchStack()
   ctx.processJsonTree(tree, base)
+  ctx.destroy()
 
   # cairo surface -> sdl serface -> sdl texture -> copy to render
   var dataPtr = surface.getData()

diff --git a/src/json_paint/shape_renderer.nim b/src/json_paint/shape_renderer.nim
@@ -141,15 +141,15 @@ proc renderText(ctx: ptr Context, tree: JsonNode, base: TreeContext) =
   var extents: TextExtents
   ctx.textExtents text.cstring, addr extents
   var realX = x - extents.xBearing
-  case text
+  case align
   of "center":
     realX = x - extents.width / 2 - extents.xBearing
   of "right":
     realX = x - extents.width - extents.xBearing
   of "left":
     discard
   else:
-    echo "unknown text align value: ", text
+    echo "WARNING: unknown align value " & align & ", expects left, center, right"
   let realY = y - extents.height / 2 - extents.yBearing
   ctx.moveTo realX, realY
   ctx.showText text

diff --git a/tests/demo.nim b/tests/demo.nim
@@ -50,7 +50,7 @@ proc renderSomething() =
       {
         "type": "text",
         "text": "this is a demo",
-        "align": "left",
+        "align": "center",
         "x": 40,
         "y": 40,
         "color": [140, 80, 76]
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     ### Usage
     ```nim
-    requires "https://github.com/Quamolit/json-paint.nim#v0.0.12"
+    requires "https://github.com/Quamolit/json-paint.nim#v0.0.16"
     ```
     ```nim
@@ Expand Down @@