aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2014-07-06 17:14:20 +0200
committerThomas White <taw@bitwiz.org.uk>2014-07-06 17:14:20 +0200
commitc04e68c97ab01b2196a0625bc5ab0df48b4b1124 (patch)
tree371d29cc13384fbed126337d4ba7f6cec7168fc5
parent3152dcee896222539f2cc3373b7e199c9076b2fa (diff)
WIP
-rw-r--r--src/mainwindow.c4
-rw-r--r--src/wrap.c6
2 files changed, 10 insertions, 0 deletions
diff --git a/src/mainwindow.c b/src/mainwindow.c
index aa77ce5..ed22a95 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1588,7 +1588,11 @@ static struct frame *create_frame(struct presentation *p, double x, double y,
}
fr = add_subframe(parent);
+
+ /* Add to SC */
+ show_sc_blocks(parent->scblocks);
fr->scblocks = NULL;
+
fr->x = x;
fr->y = y;
fr->w = w;
diff --git a/src/wrap.c b/src/wrap.c
index e684989..9406620 100644
--- a/src/wrap.c
+++ b/src/wrap.c
@@ -921,6 +921,12 @@ int wrap_contents(struct frame *fr)
l->boxes[0].width = 0;
/* FIXME: Get ascent and descent from font metrics for
* whichever font will be used in this box */
+ } else {
+ l->boxes[0].scblock = fr->scblocks;
+ l->boxes[0].offs_char = 0;
+ l->boxes[0].ascent = 10000;
+ l->boxes[0].height = 10000;
+ l->boxes[0].width = 0;
}
}