i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Line wrapping needs to work at charachter level, not byte level

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9762 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2004-11-03 11:54:38 +00:00
parent 2d7662810e
commit 84fed7e642
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/BTextView/TextView.cpp
+6 -4
View File
@@ -3354,8 +3354,9 @@ BTextView::RecalLineBreaks(int32 *startLine, int32 *endLine)
&descent, &width); &descent, &width);
// we want to advance at least by one character // we want to advance at least by one character
if (toOffset == fromOffset && fromOffset < textLength) int32 nextOffset = NextInitialByte(fromOffset);
toOffset = NextInitialByte(toOffset); if (toOffset < nextOffset && fromOffset < textLength)
toOffset = nextOffset;
// set the ascent of this line // set the ascent of this line
curLine->ascent = ascent; curLine->ascent = ascent;
@@ -3573,7 +3574,8 @@ BTextView::FindLineBreak(int32 fromOffset, float *outAscent,
strWidth = 0.0; strWidth = 0.0;
for (offset = fromOffset; offset < limit; offset++) { for (offset = fromOffset; offset < limit; offset++) {
strWidth += StyledWidth(offset, 1, &ascent, &descent); int32 nextInitial = NextInitialByte(offset);
strWidth += StyledWidth(offset, nextInitial - offset, &ascent, &descent);
if (strWidth >= *ioWidth) if (strWidth >= *ioWidth)
break; break;
@@ -3614,7 +3616,7 @@ BTextView::StyledWidth(int32 fromOffset, int32 length, float *outAscent,
maxAscent = max_c(ascent, maxAscent); maxAscent = max_c(ascent, maxAscent);
maxDescent = max_c(descent, maxDescent); maxDescent = max_c(descent, maxDescent);
// Use _BWidthBuffer_ if possible // Use _BWidthBuffer_ if possible (TODO: reenable this when it's fixed)
if (false && (sWidths != NULL)) { if (false && (sWidths != NULL)) {
LockWidthBuffer(); LockWidthBuffer();
result += sWidths->StringWidth(*fText, fromOffset, numChars, font); result += sWidths->StringWidth(*fText, fromOffset, numChars, font);