diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2012-12-12 08:40:52 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2012-12-12 08:40:52 +0100 |
| commit | d990869a2a91d14f28813b700a20ba3c462b66e1 (patch) | |
| tree | 3198a524995ce94550c7be4dff023a65e19f7ad5 | |
| parent | 2982aa6f70d4644ac2a5dd0ae4b6449c9a7b5ab2 (diff) | |
Fix render_test_sc1
| -rw-r--r-- | src/frame.c | 3 | ||||
| -rw-r--r-- | src/render.c | 2 | ||||
| -rw-r--r-- | tests/render_test_sc1.c | 6 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/frame.c b/src/frame.c index 21e26af..4cbb432 100644 --- a/src/frame.c +++ b/src/frame.c @@ -59,8 +59,7 @@ struct frame *frame_new() n->max_children = 32; alloc_ro(n); - n->num_children = 1; - n->children[0] = n; + n->num_children = 0; n->pl = NULL; n->contents = NULL; diff --git a/src/render.c b/src/render.c index 2265123..22ded61 100644 --- a/src/render.c +++ b/src/render.c @@ -437,7 +437,7 @@ static int render_sc(struct frame *fr, double max_w, double max_h) /* Find and load font */ s.fontmap = pango_cairo_font_map_get_default(); s.pc = pango_font_map_create_context(s.fontmap); - fontdesc = pango_font_description_from_string("Sorts Mill Goudy Bold 10"); + fontdesc = pango_font_description_from_string("Sorts Mill Goudy 16"); /* Set up attribute list to use the font */ s.attrs = pango_attr_list_new(); diff --git a/tests/render_test_sc1.c b/tests/render_test_sc1.c index ef902ce..67e8e14 100644 --- a/tests/render_test_sc1.c +++ b/tests/render_test_sc1.c @@ -87,6 +87,7 @@ int main(int argc, char *argv[]) sty->lop.margin_r = 0.0; sty->lop.margin_t = 0.0; sty->lop.margin_b = 0.0; + sty->lop.grav = DIR_UL; sty->name = strdup("Default"); sty2 = calloc(1, sizeof(struct style)); @@ -98,12 +99,11 @@ int main(int argc, char *argv[]) sty2->lop.margin_r = 20.0; sty2->lop.margin_t = 20.0; sty2->lop.margin_b = 20.0; + sty2->lop.grav = DIR_UL; sty2->name = strdup("Subframe1"); fr->style = sty; - fr->children[1]->style = sty2; - - assert(fr->children[0] == fr); + fr->children[0]->style = sty2; s.top = fr; s.rendered_edit = NULL; |