mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-21 19:52:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make use of cached place float below value earlier.

Browse Source
This commit is contained in:
Michael Drake 2016-01-20 22:37:22 +00:00
parent 0bbc03c577
commit a774e9473d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
render/layout.c
View File

@ -2775,7 +2775,8 @@ bool layout_line(struct box *first, int *width, int *y,
left == 0 && right == 0)) && left == 0 && right == 0)) &&
(!place_below || (!place_below ||
(left == 0 && right == 0 && x == 0)) && (left == 0 && right == 0 && x == 0)) &&
cy >= cont->clear_level) { cy >= cont->clear_level &&
cy >= cont->cached_place_below_level) {
/* + not cleared or, /* + not cleared or,
* cleared and there are no floats to clear * cleared and there are no floats to clear
* + fits without needing to be placed below or, * + fits without needing to be placed below or,
@ -2800,6 +2801,9 @@ bool layout_line(struct box *first, int *width, int *y,
/* place below into next available space */ /* place below into next available space */
int fcy = (cy > cont->clear_level) ? cy : int fcy = (cy > cont->clear_level) ? cy :
cont->clear_level; cont->clear_level;
fcy = (fcy > cont->cached_place_below_level) ?
fcy :
cont->cached_place_below_level;
fy = (fy > fcy) ? fy : fcy; fy = (fy > fcy) ? fy : fcy;
fy = (fy == cy) ? fy + height : fy; fy = (fy == cy) ? fy + height : fy;