From 948207472ac1d405e6e6552eb51c6ed1a67ee32e Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Fri, 29 Jun 2018 14:58:32 +0100 Subject: Layout: Tidy condition so it can be read. --- content/handlers/html/layout.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'content') diff --git a/content/handlers/html/layout.c b/content/handlers/html/layout.c index 2d2c42438..e9112faf1 100644 --- a/content/handlers/html/layout.c +++ b/content/handlers/html/layout.c @@ -4138,13 +4138,12 @@ layout_block_context(struct box *block, } /* Vertical margin */ - if (((box->type == BOX_BLOCK && - (box->flags & HAS_HEIGHT)) || - box->type == BOX_TABLE || - (box->type == BOX_INLINE_CONTAINER && - box != box->parent->children) || - margin_collapse == box) && - in_margin == true) { + if (((box->type == BOX_BLOCK && (box->flags & HAS_HEIGHT)) || + box->type == BOX_TABLE || + (box->type == BOX_INLINE_CONTAINER && + box != box->parent->children) || + margin_collapse == box) && + in_margin == true) { /* Margin goes above this box. */ cy += max_pos_margin - max_neg_margin; box->y += max_pos_margin - max_neg_margin; -- cgit v1.2.3