diff options
author | James Bursa <james@netsurf-browser.org> | 2005-08-07 21:28:48 +0000 |
---|---|---|
committer | James Bursa <james@netsurf-browser.org> | 2005-08-07 21:28:48 +0000 |
commit | 419517f0aa62055e6fe7fdd401fdb3cddd6c0fd6 (patch) | |
tree | e2d0061527718d8beac381a1fcac57e0c9cdbf2f /render/html.c | |
parent | 1808739e3361c89f7d9a2995b5a1478c5fdf1b3e (diff) | |
download | netsurf-419517f0aa62055e6fe7fdd401fdb3cddd6c0fd6.tar.gz netsurf-419517f0aa62055e6fe7fdd401fdb3cddd6c0fd6.tar.bz2 |
[project @ 2005-08-07 21:28:48 by bursa]
Improvements to frames. Fix bug with BR at end of inline container.
svn path=/import/netsurf/; revision=1843
Diffstat (limited to 'render/html.c')
-rw-r--r-- | render/html.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/render/html.c b/render/html.c index 935f72a46..1fd7308a6 100644 --- a/render/html.c +++ b/render/html.c @@ -972,11 +972,16 @@ void html_object_done(struct box *box, struct content *object, return; } - box->object = object; - - if (box->width != UNKNOWN_WIDTH && - object->available_width != box->width) - content_reformat(object, box->width, box->height); + if (object->type == CONTENT_HTML) { + /* patch in the HTML object's box tree */ + box->children = object->data.html.layout; + object->data.html.layout->parent = box; + } else { + box->object = object; + if (box->width != UNKNOWN_WIDTH && + object->available_width != box->width) + content_reformat(object, box->width, box->height); + } /* invalidate parent min, max widths */ for (b = box->parent; b; b = b->parent) |