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

TextDocument: More fixes

Browse Source 
* Fixed ParagraphIndexFor() not returning the last paragraph when the
   requested text offset was right at the text end.
 * Fixed off-by-one error detecting inserted line-breaks.
This commit is contained in:
Stephan Aßmus
2014-01-20 00:50:37 +01:00
parent 2188476555
commit fa8b5d525e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/haiku-depot/textview/TextDocument.cpp
+6 -4
View File
@@ -127,7 +127,7 @@ TextDocument::Insert(int32 textOffset, const BString& text,
int32 chunkStart = 0; int32 chunkStart = 0;
while (chunkStart < length) { while (chunkStart < length) {
int32 chunkEnd = text.FindFirst('\n', chunkStart); int32 chunkEnd = text.FindFirst('\n', chunkStart);
bool foundLineBreak = chunkEnd > chunkStart; bool foundLineBreak = chunkEnd >= chunkStart;
if (foundLineBreak) if (foundLineBreak)
chunkEnd++; chunkEnd++;
else else
@@ -317,10 +317,12 @@ TextDocument::ParagraphIndexFor(int32 textOffset, int32& paragraphOffset) const
for (int32 i = 0; i < count; i++) { for (int32 i = 0; i < count; i++) {
const Paragraph& paragraph = fParagraphs.ItemAtFast(i); const Paragraph& paragraph = fParagraphs.ItemAtFast(i);
int32 paragraphLength = paragraph.Length(); int32 paragraphLength = paragraph.Length();
if (textLength + paragraphLength > textOffset)
return i;
paragraphOffset += paragraphLength;
textLength += paragraphLength; textLength += paragraphLength;
if (textLength > textOffset
|| (i == count - 1 && textLength == textOffset)) {
return i;
}
paragraphOffset += paragraphLength;
} }
return -1; return -1;
} }