Reformat floated iframe browser windows only after the iframe box has been linked into the box tree from the block formatting context block.
svn path=/trunk/netsurf/; revision=12476
This commit is contained in:
parent
319a90bff7
commit
188712d142
|
@ -2497,12 +2497,8 @@ bool layout_line(struct box *first, int *width, int *y,
|
||||||
if (b->height == AUTO)
|
if (b->height == AUTO)
|
||||||
b->height = 300;
|
b->height = 300;
|
||||||
|
|
||||||
/* If the iframe's bw is in place, reformat it to the
|
/* We reformat the iframe browser window to new
|
||||||
* new box size */
|
* dimensions in pass 2 */
|
||||||
if (b->iframe) {
|
|
||||||
browser_window_reformat(b->iframe,
|
|
||||||
b->width, b->height);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
/* form control with no object */
|
/* form control with no object */
|
||||||
if (b->width == AUTO)
|
if (b->width == AUTO)
|
||||||
|
@ -2734,6 +2730,14 @@ bool layout_line(struct box *first, int *width, int *y,
|
||||||
}
|
}
|
||||||
b->next_float = cont->float_children;
|
b->next_float = cont->float_children;
|
||||||
cont->float_children = b;
|
cont->float_children = b;
|
||||||
|
|
||||||
|
/* If the iframe's bw is in place, reformat it to the
|
||||||
|
* new box size */
|
||||||
|
if (b->iframe) {
|
||||||
|
browser_window_reformat(b->iframe,
|
||||||
|
b->width, b->height);
|
||||||
|
}
|
||||||
|
|
||||||
split_box = 0;
|
split_box = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue