Update to new typography.

Author: treeform

fidget.nimble

@@ -10,7 +10,7 @@ srcDir        = "src"
 
 requires "nim >= 1.0.0"
 requires "chroma >= 0.1.3"
-requires "typography >= 0.3.3"
+requires "typography >= 0.4.0"
 requires "flippy >= 0.4.4"
 requires "vmath >= 0.3.1"
 requires "print >= 0.1.0"

src/fidget/opengl/context.nim

@@ -335,9 +335,35 @@ proc setVertColor(buf: var seq[uint8], i: int, color: ColorRGBA) =
   buf[i * 4 + 2] = color.b
   buf[i * 4 + 3] = color.a
 
-func `*`(m: Mat4, v: Vec2): Vec2 =
+func `*`*(m: Mat4, v: Vec2): Vec2 =
   (m * vec3(v, 0.0)).xy
 
+proc drawQuad*(
+  ctx: Context,
+  verts: array[4, Vec2],
+  uvs: array[4, Vec2],
+  colors: array[4, ColorRGBA],
+) =
+  ctx.checkBatch()
+
+  let offset = ctx.quadCount * 4
+  ctx.positions.data.setVert2(offset + 0, verts[0])
+  ctx.positions.data.setVert2(offset + 1, verts[1])
+  ctx.positions.data.setVert2(offset + 2, verts[2])
+  ctx.positions.data.setVert2(offset + 3, verts[3])
+
+  ctx.uvs.data.setVert2(offset + 0, uvs[0])
+  ctx.uvs.data.setVert2(offset + 1, uvs[1])
+  ctx.uvs.data.setVert2(offset + 2, uvs[2])
+  ctx.uvs.data.setVert2(offset + 3, uvs[3])
+
+  ctx.colors.data.setVertColor(offset + 0, colors[0])
+  ctx.colors.data.setVertColor(offset + 1, colors[1])
+  ctx.colors.data.setVertColor(offset + 2, colors[2])
+  ctx.colors.data.setVertColor(offset + 3, colors[3])
+
+  inc ctx.quadCount
+
 proc drawUvRect(ctx: Context, at, to: Vec2, uvAt, uvTo: Vec2, color: Color) =
   ## Adds an image rect with a path to an ctx
   ctx.checkBatch()

src/fidget/openglbackend.nim

@@ -51,9 +51,12 @@ proc focus*(keyboard: Keyboard, node: Node) =
     keyboard.onFocusNode = node
     keyboard.focusNode = node
 
+    var font = fonts[node.textStyle.fontFamily]
+    font.size = node.textStyle.fontSize
+    font.lineHeight = node.textStyle.lineHeight
     keyboard.input = node.text
     textBox = newTextBox(
-      fonts[node.textStyle.fontFamily],
+      font,
       int node.screenBox.w,
       int node.screenBox.h,
       node.text,
@@ -116,8 +119,8 @@ proc drawText(node: Node) =
   let editing = keyboard.focusNode == node
 
   if editing:
-    if textBox.size != node.box.wh:
-      textBox.resize(node.box.wh)
+    if textBox.size != node.screenBox.wh:
+      textBox.resize(node.screenBox.wh)
     node.textLayout = textBox.layout
     ctx.saveTransform()
     ctx.translate(-textBox.scroll)
@@ -128,7 +131,7 @@ proc drawText(node: Node) =
 
   # draw characters
   for glyphIdx, pos in node.textLayout:
-    if pos.character notin font.glyphs:
+    if pos.character notin font.typeface.glyphs:
       continue
     if pos.rune == Rune(32):
       # Don't draw space, even if font has a char for it.
@@ -162,7 +165,7 @@ proc drawText(node: Node) =
 
     if hashFill notin ctx.entries:
       var
-        glyph = font.glyphs[pos.character]
+        glyph = font.typeface.glyphs[pos.character]
         glyphOffset: Vec2
       let glyphFill = font.getGlyphImage(
         glyph,
@@ -174,7 +177,7 @@ proc drawText(node: Node) =
 
     if node.strokeWeight > 0 and hashStroke notin ctx.entries:
       var
-        glyph = font.glyphs[pos.character]
+        glyph = font.typeface.glyphs[pos.character]
         glyphOffset: Vec2
       let glyphFill = font.getGlyphImage(
         glyph,
@@ -323,6 +326,8 @@ proc setupFidget(
 
     drawMain()
 
+    root.removeExtraChildren()
+
     computeLayout(nil, root)
     computeScreenBox(nil, root)