AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

experimental/editor: fix Movement::kUp, Movement::kDown

Browse Source 
Bug: skia:9020
Change-Id: I5c765f2be92971690f59d744207cf8b8f78c8c4a
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/230128
Auto-Submit: Hal Canary <halcanary@google.com>
Reviewed-by: Julia Lavrova <jlavrova@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
This commit is contained in:
Hal Canary 2019-07-26 12:08:31 -04:00 committed by Skia Commit-Bot
parent b28cb68bc0
commit ac0e466154
1 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
experimental/editor/editor.cpp
View File

@ -410,15 +410,44 @@ Editor::TextPosition Editor::move(Editor::Movement move, Editor::TextPosition po
}
break;
case Editor::Movement::kUp:
if (pos.fParagraphIndex < fLines.size()) {
const std::vector<unsigned>& list = fLines[pos.fParagraphIndex].fLineEndOffsets;
size_t f = find_first_larger(list, SkToUInt(pos.fTextByteIndex));
// list[f] > value. value > list[f-1]
if (f > 0) {
// not the first line in paragraph.
pos.fTextByteIndex -= list[f-1];
if (f > 1) {
pos.fTextByteIndex += list[f-2];
}
} else {
if (pos.fParagraphIndex > 0) {
--pos.fParagraphIndex;
size_t r = fLines[pos.fParagraphIndex].fLineEndOffsets.size();
if (r > 0) {
pos.fTextByteIndex +=
fLines[pos.fParagraphIndex].fLineEndOffsets[r - 1];
}
}
}
pos.fTextByteIndex =
align_column(fLines[pos.fParagraphIndex].fText, pos.fTextByteIndex);
}
break;
case Editor::Movement::kDown:
if (pos.fParagraphIndex + 1 < fLines.size()) {
if (pos.fParagraphIndex < fLines.size()) {
const std::vector<unsigned>& list = fLines[pos.fParagraphIndex].fLineEndOffsets;
size_t f = find_first_larger(list, SkToUInt(pos.fTextByteIndex));
if (f > 0) {
pos.fTextByteIndex -= list[f - 1];
}
if (f < list.size()) {
pos.fTextByteIndex += list[f];
} else if (pos.fParagraphIndex + 1 < fLines.size()) {
++pos.fParagraphIndex;
} else {
pos.fTextByteIndex = fLines[pos.fParagraphIndex].fText.size();
}
pos.fTextByteIndex =
align_column(fLines[pos.fParagraphIndex].fText, pos.fTextByteIndex);
}