add textblobs to lua

resources/slides.lua

+gShowBounds = false
 
 gPath = "/skia/trunk/resources/"
 
 function load_file(file)
     local prev_path = package.path
     package.path = package.path .. ";" .. gPath .. file .. ".lua"
     require(file)
     package.path = prev_path
 end
 
@@ skipping 19 matching lines @@
     if 0 == indent then
         return
     end
     local ps = paint:getTextSize()
     local cx = x - ps * .8
     local cy = y - ps * .4
     local radius = ps * .2
     canvas:drawCircle(cx, cy, radius, paint)
 end
 
+function stroke_rect(canvas, rect, color)
+    local paint = Sk.newPaint()
+    paint:setStroke(true);
+    paint:setColor(color)
+    canvas:drawRect(rect, paint)
+end
+
 function drawSlide(canvas, slide, master_template)
     template = master_template.slide   -- need to sniff the slide to know if we're title or slide
 
     local x = template.margin_x
     local y = template.margin_y
     local scale = 1.25
 
     if slide.blockstyle == "code" then
         local paint = master_template.codePaint
         local fm = paint:getFontMetrics()
         local height = #slide * (fm.descent - fm.ascent)
         y = (480 - height) / 2
         for i = 1, #slide do
             local node = slide[i]
             y = y - fm.ascent * scale
             canvas:drawText(node.text, x, y, paint)
             y = y + fm.descent * scale
         end
         return
     end
 
     for i = 1, #slide do
         local node = slide[i]
         local paint = template[node.indent + 1].paint
         local extra_dy = template[node.indent + 1].extra_dy
         local fm = paint:getFontMetrics()
         local x_offset = -fm.ascent * node.indent * 1.25
 
-        y = y - fm.ascent * scale
-        draw_bullet(canvas, x + x_offset, y, paint, node.indent)
-        canvas:drawText(node.text, x + x_offset, y, paint)
-        y = y + fm.descent * scale + extra_dy
+        local bounds = make_rect(x + x_offset, y, 620, 640)
+        local blob, newBottom = Sk.newTextBlob(node.text, bounds, paint)
+        draw_bullet(canvas, x + x_offset, y - fm.ascent, paint, node.indent)
+        canvas:drawTextBlob(blob, 0, 0, paint)
+        y = newBottom + paint:getTextSize() * .5
+
+        if gShowBounds then
+            bounds.bottom = newBottom
+            stroke_rect(canvas, bounds, {a=1,r=0,g=1,b=0})
+            stroke_rect(canvas, blob:bounds(), {a=1,r=1,g=0,b=0})
+        end
+
     end
 end
 
 --------------------------------------------------------------------------------------
 function make_tmpl(paint, extra_dy)
     return { paint = paint, extra_dy = extra_dy }
 end
 
 function SkiaPoint_make_template()
     local title = {
@@ skipping 216 matching lines @@
     return false
 end
 
 local keyProcs = {
     n = next_slide,
     p = prev_slide,
     r = spawn_rotate_animation,
     s = spawn_scale_animation,
     ["="] = function () scale_text_delta(gTemplate, 1) end,
     ["-"] = function () scale_text_delta(gTemplate, -1) end,
+
+    b = function () gShowBounds = not gShowBounds end,
 }
 
 function onCharHandler(uni)
     local proc = keyProcs[uni]
     if proc then
         proc()
         return true
     end
     return false
 end