forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Caret movement

This commit is contained in:
James Johnson 2018-01-11 13:02:13 -05:00
parent bd721d590e
commit 422517aff4
1 changed files with 62 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/dlangui/widgets/editors.d
View File

@ -2848,17 +2848,73 @@ class EditBox : EditWidgetBase {
return true; return true;
case Up: case Up:
case SelectUp: case SelectUp:
if (_caretPos.line > 0) { if ((_caretPos.line > 0) | wordWrap) {
_caretPos.line--; if (_wordWrap)
correctCaretPos(); {
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); LineSpan curSpan = getSpan(_caretPos.line);
ensureCaretVisible(); int curWrap = findWrapLine(_caretPos);
if (curWrap > 0)
{
_caretPos.pos-= curSpan.wrapPoints[curWrap - 1].wrapPos;
}
else
{
int previousPos = _caretPos.pos;
curSpan = getSpan(_caretPos.line - 1);
curWrap = curSpan.len - 1;
if (curWrap > 0)
{
int accumulativePoint = curSpan.accumulation(curSpan.len - 1, LineSpan.WrapPointInfo.Position);
_caretPos.line--;
_caretPos.pos = accumulativePoint + previousPos;
}
else
{
_caretPos.line--;
}
}
}
else if(_caretPos.line > 0)
_caretPos.line--;
correctCaretPos();
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
ensureCaretVisible();
} }
return true; return true;
case Down: case Down:
case SelectDown: case SelectDown:
if (_caretPos.line < _content.length - 1) { if (_caretPos.line < _content.length - 1) {
_caretPos.line++; if (_wordWrap)
{
LineSpan curSpan = getSpan(_caretPos.line);
int curWrap = findWrapLine(_caretPos);
if (curWrap < curSpan.len - 1)
{
int previousPos = _caretPos.pos;
_caretPos.pos+= curSpan.wrapPoints[curWrap].wrapPos;
correctCaretPos();
if (_caretPos.pos == previousPos)
{
_caretPos.pos = 0;
_caretPos.line++;
}
}
else if (curSpan.len > 1)
{
int previousPos = _caretPos.pos;
int previousAccumulatedPosition = curSpan.accumulation(curSpan.len - 1, LineSpan.WrapPointInfo.Position);
_caretPos.line++;
_caretPos.pos = previousPos - previousAccumulatedPosition;
}
else
{
_caretPos.line++;
}
}
else
{
_caretPos.line++;
}
correctCaretPos(); correctCaretPos();
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
ensureCaretVisible(); ensureCaretVisible();