mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[project @ 2006-01-15 22:25:40 by bursa] 

Fix crash related to negative margins on inlines.

svn path=/import/netsurf/; revision=2021
This commit is contained in:
James Bursa 2006-01-15 22:25:40 +00:00
parent 5d6c565828
commit e8ef816111
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
render/layout.c
View File

@ -3,7 +3,7 @@
* Licensed under the GNU General Public License, * Licensed under the GNU General Public License,
* http://www.opensource.org/licenses/gpl-license * http://www.opensource.org/licenses/gpl-license
* Copyright 2005 Richard Wilson <info@tinct.net> * Copyright 2005 Richard Wilson <info@tinct.net>
* Copyright 2005 James Bursa <bursa@users.sourceforge.net> * Copyright 2006 James Bursa <bursa@users.sourceforge.net>
* Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net> * Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
*/ */
@ -1095,12 +1095,17 @@ bool layout_line(struct box *first, int width, int *y,
for (i = 0; i != 4; i++) for (i = 0; i != 4; i++)
if (b->margin[i] == AUTO) if (b->margin[i] == AUTO)
b->margin[i] = 0; b->margin[i] = 0;
x += b->margin[LEFT] + b->border[LEFT] +
b->padding[LEFT];
if (b->inline_end) { if (b->inline_end) {
b->inline_end->margin[RIGHT] = b->margin[RIGHT]; b->inline_end->margin[RIGHT] = b->margin[RIGHT];
b->inline_end->padding[RIGHT] = b->inline_end->padding[RIGHT] =
b->padding[RIGHT]; b->padding[RIGHT];
b->inline_end->border[RIGHT] = b->inline_end->border[RIGHT] =
b->border[RIGHT]; b->border[RIGHT];
} else {
x += b->padding[RIGHT] + b->border[RIGHT] +
b->margin[RIGHT];
} }
} else if (b->type == BOX_INLINE_END) { } else if (b->type == BOX_INLINE_END) {
b->width = 0; b->width = 0;
@ -1110,6 +1115,8 @@ bool layout_line(struct box *first, int width, int *y,
} else { } else {
space_after = 0; space_after = 0;
} }
x += b->padding[RIGHT] + b->border[RIGHT] +
b->margin[RIGHT];
continue; continue;
} }