From bd3f65b7da66c55c037c493576701a141ef85019 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sun, 11 Nov 2012 19:13:36 +0000 Subject: [PATCH] Use can_reformat instead of HTML special case. Allow reflow of parent for any object that gets a reformat. --- render/html.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/render/html.c b/render/html.c index 56c65a5d3..f6e3fda56 100644 --- a/render/html.c +++ b/render/html.c @@ -1178,14 +1178,15 @@ html_object_callback(hlcache_handle *object, break; case CONTENT_MSG_READY: - /* TODO: avoid knowledge of box internals here */ - content_reformat(object, false, - box->max_width != UNKNOWN_MAX_WIDTH ? - box->width : 0, - box->max_width != UNKNOWN_MAX_WIDTH ? - box->height : 0); + if (content_can_reformat(object)) { + /* TODO: avoid knowledge of box internals here */ + content_reformat(object, false, + box->max_width != UNKNOWN_MAX_WIDTH ? + box->width : 0, + box->max_width != UNKNOWN_MAX_WIDTH ? + box->height : 0); - if (content_get_type(object) == CONTENT_HTML) { + /* Adjust parent content for new object size */ html_object_done(box, object, o->background); if (c->base.status == CONTENT_STATUS_READY || c->base.status == CONTENT_STATUS_DONE)