add bullets to slides

resources/slides.lua

 
 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
 
 load_file("slides_utils")
 
 gSlides = parse_file(io.open("/skia/trunk/resources/slides_content2.lua", "r"))
 
 function make_rect(l, t, r, b)
     return { left = l, top = t, right = r, bottom = b }
 end
 
 function make_paint(typefacename, stylebits, size, color)
     local paint = Sk.newPaint();
     paint:setAntiAlias(true)
     paint:setSubpixelText(true)
     paint:setTypeface(Sk.newTypeface(typefacename, stylebits))
     paint:setTextSize(size)
     paint:setColor(color)
     return paint
 end
 
+function draw_bullet(canvas, x, y, paint, indent)
+    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 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
+            y = y - fm.ascent * scale
             canvas:drawText(node.text, x, y, paint)
-            y = y + fm.descent
+            y = y + fm.descent * scale
         end
         return
     end
 
-    local scale = 1.25
     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
+        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
     end
 end
 
 --------------------------------------------------------------------------------------
 function make_tmpl(paint, extra_dy)
     return { paint = paint, extra_dy = extra_dy }
 end
 
 function SkiaPoint_make_template()
     local title = {
         margin_x = 30,
         margin_y = 100,
     }
-    title[1] = make_paint("Arial", 1, 50, { a=1, r=1, g=1, b=1 })
+    title[1] = make_paint("Arial", 1, 45, { a=1, r=1, g=1, b=1 })
     title[1]:setTextAlign("center")
     title[2] = make_paint("Arial", 1, 25, { a=1, r=.75, g=.75, b=.75 })
     title[2]:setTextAlign("center")
 
     local slide = {
         margin_x = 20,
         margin_y = 25,
     }
-    slide[1] = make_tmpl(make_paint("Arial", 1, 36, { a=1, r=1, g=1, b=1 }), 18)
-    slide[2] = make_tmpl(make_paint("Arial", 0, 30, { a=1, r=1, g=1, b=1 }), 0)
-    slide[3] = make_tmpl(make_paint("Arial", 0, 24, { a=1, r=.8, g=.8, b=.8 }), 0)
+    slide[1] = make_tmpl(make_paint("Arial", 1, 35, { a=1, r=1, g=1, b=1 }), 18)
+    slide[2] = make_tmpl(make_paint("Arial", 0, 25, { a=1, r=1, g=1, b=1 }), 0)
+    slide[3] = make_tmpl(make_paint("Arial", 0, 20, { a=1, r=.9, g=.9, b=.9 }), 0)
 
     return {
         title = title,
         slide = slide,
-        codePaint = make_paint("Courier", 0, 24, { a=1, r=.9, g=.9, b=.9 }),
+        codePaint = make_paint("Courier", 0, 20, { a=1, r=.9, g=.9, b=.9 }),
     }
 end
 
 gTemplate = SkiaPoint_make_template()
 
 gRedPaint = Sk.newPaint()
 gRedPaint:setAntiAlias(true)
 gRedPaint:setColor{a=1, r=1, g=0, b=0 }
 
 -- animation.proc is passed the canvas before drawing.
@@ skipping 196 matching lines @@
 }
 
 function onCharHandler(uni)
     local proc = keyProcs[uni]
     if proc then
         proc()
         return true
     end
     return false
 end