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

Closing #5959:

Browse Source 
* _DoInsertText() must not assume that the text is actually being inserted
  by InsertText(), since that's a virtual method meant to be overridden by
  subclasses. So the updating of caret-position and selection start/end has
  to happen in InsertText().


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38006 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Oliver Tappe
2010-08-10 14:02:22 +00:00
parent cb06c64a5d
commit e70da3e14c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/TextView.cpp
+6 -6
View File
@@ -3039,6 +3039,12 @@ BTextView::InsertText(const char *inText, int32 inLength, int32 inOffset,
// update the style runs // update the style runs
fStyles->BumpOffset(inLength, fStyles->OffsetToRun(inOffset - 1) + 1); fStyles->BumpOffset(inLength, fStyles->OffsetToRun(inOffset - 1) + 1);
// offset the caret/selection, if the text was inserted before it
if (inOffset <= fSelEnd) {
fSelStart += inLength;
fCaretOffset = fSelEnd = fSelStart;
}
} }
if (fStylable && inRuns != NULL) { if (fStylable && inRuns != NULL) {
@@ -4202,12 +4208,6 @@ BTextView::_DoInsertText(const char *inText, int32 inLength, int32 inOffset,
// copy data into buffer // copy data into buffer
InsertText(inText, inLength, inOffset, inRuns); InsertText(inText, inLength, inOffset, inRuns);
// offset the caret/selection, if the text was inserted before it
if (inOffset <= fSelEnd) {
fSelStart += inLength;
fCaretOffset = fSelEnd = fSelStart;
}
// recalc line breaks and draw the text // recalc line breaks and draw the text
_Refresh(inOffset, inOffset + inLength, false); _Refresh(inOffset, inOffset + inLength, false);
} }