Commit a408e2ee authored by hyatt's avatar hyatt

NOWRAP was completely broken. This fixes the problem

	and makes porsche.com look ok again.

	Bug #3131287.

        Reviewed by gramps

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


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3117 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7894002d
2002-12-17 David Hyatt <hyatt@apple.com>
NOWRAP was completely broken. This fixes the problem
and makes porsche.com look ok again.
Bug #3131287.
Reviewed by gramps
* khtml/rendering/bidi.cpp:
(RenderFlow::findNextLineBreak):
2002-12-17 Darin Adler <darin@apple.com>
Reviewed by Trey.
......
2002-12-17 David Hyatt <hyatt@apple.com>
NOWRAP was completely broken. This fixes the problem
and makes porsche.com look ok again.
Bug #3131287.
Reviewed by gramps
* khtml/rendering/bidi.cpp:
(RenderFlow::findNextLineBreak):
2002-12-17 Darin Adler <darin@apple.com>
Reviewed by Trey.
......
......@@ -1251,6 +1251,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
// proportional font, needs a bit more work.
int lastSpace = pos;
bool isPre = o->style()->whiteSpace() == PRE;
//QChar space[1]; space[0] = ' ';
//int spaceWidth = f->width(space, 1, 0);
while(len) {
......@@ -1305,7 +1306,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
}
}
if ( !isPre && w + tmpW > width )
if (w + tmpW > width && o->style()->whiteSpace() == NORMAL)
goto end;
lBreak.obj = o;
......@@ -1425,7 +1426,7 @@ BidiIterator RenderFlow::findNextLineBreak(BidiIterator &start, QPtrList<BidiIte
#ifdef DEBUG_LINEBREAKS
kdDebug( 6041 ) << "end of par, width = " << width << " linewidth = " << w + tmpW << endl;
#endif
if( w + tmpW <= width ) {
if( w + tmpW <= width || (last && last->style()->whiteSpace() == NOWRAP)) {
lBreak.obj = 0;
lBreak.pos = 0;
}
......
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