summaryrefslogtreecommitdiff
path: root/render/layout.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-02-24 15:45:10 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-02-24 15:45:10 +0000
commit9125bd1fa4aa636ec3497fed9a7622257490d383 (patch)
tree610efdd2dd1f9b72601860712c08eaf45a65d4e6 /render/layout.c
parentb68dc734e1087624f3dd51f2b21225168d65e640 (diff)
downloadnetsurf-9125bd1fa4aa636ec3497fed9a7622257490d383.tar.gz
netsurf-9125bd1fa4aa636ec3497fed9a7622257490d383.tar.bz2
Apply margin before clear.
svn path=/trunk/netsurf/; revision=11786
Diffstat (limited to 'render/layout.c')
-rw-r--r--render/layout.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/render/layout.c b/render/layout.c
index fc21ef284..f8f7e16ed 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -365,8 +365,8 @@ bool layout_block_context(struct box *block, int viewport_height,
* floats. */
int x0, x1, top;
struct box *left, *right;
- top = cy > y ? cy : y;
- top += max_pos_margin - max_neg_margin;
+ top = cy + max_pos_margin - max_neg_margin;
+ top = (top > y) ? top : y;
x0 = cx;
x1 = cx + box->parent->width -
box->parent->padding[LEFT] -