Commit a14d1741 authored by hyatt's avatar hyatt
Browse files

Fix for bug #3137935. When a float causes a line to get

	moved down past the float, the line would incorrectly break
	rather than expanding to use the newly-available width.

        Reviewed by darin.

        * khtml/rendering/bidi.cpp:
        (RenderFlow::findNextLineBreak):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3235 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5be0ed74
2003-01-02 David Hyatt <hyatt@apple.com>
Fix for bug #3137935. When a float causes a line to get
moved down past the float, the line would incorrectly break
rather than expanding to use the newly-available width.
Reviewed by darin.
* khtml/rendering/bidi.cpp:
(RenderFlow::findNextLineBreak):
2003-01-02 Darin Adler <darin@apple.com>
Reviewed by John.
......
2003-01-02 David Hyatt <hyatt@apple.com>
Fix for bug #3137935. When a float causes a line to get
moved down past the float, the line would incorrectly break
rather than expanding to use the newly-available width.
Reviewed by darin.
* khtml/rendering/bidi.cpp:
(RenderFlow::findNextLineBreak):
2003-01-02 Darin Adler <darin@apple.com>
Reviewed by John.
......
......@@ -1393,7 +1393,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
// if we have floats, try to get below them.
if (sawSpace && !ignoringSpaces && o->style()->whiteSpace() != PRE)
trailingSpaceObject = 0;
int fb = floatBottom();
int newLineWidth = lineWidth(fb);
if( !w && m_height < fb && width < newLineWidth ) {
......@@ -1420,7 +1420,12 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
lBreak.pos = pos;
}
}
goto end;
// |width| may have been adjusted because we got shoved down past a float (thus
// giving us more room), so we need to retest, and only jump to
// the end label if we still don't fit on the line. -dwh
if (w + tmpW > width+1)
goto end;
}
last = o;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment