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

move cursor to prev/next line on left/right buttons at begin/end of line

This commit is contained in:
Vadim Lopatin 2014-04-22 19:18:03 +04:00
parent c58e4eeee3
commit 408c29aa95
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,11 @@ class EditableContent {
return index >= 0 && index < _lines.length ? _lines[index] : ""d; return index >= 0 && index < _lines.length ? _lines[index] : ""d;
} }
/// returns text position for end of line lineIndex
TextPosition lineEnd(int lineIndex) {
return TextPosition(lineIndex, lineIndex >= 0 && lineIndex < _lines.length ? cast(int)_lines[lineIndex].length : 0);
}
/// returns maximum length of line /// returns maximum length of line
int maxLineLength() { int maxLineLength() {
int m = 0; int m = 0;
@ -552,8 +557,11 @@ class EditWidgetBase : WidgetGroup, EditableContentListener {
_caretPos.pos--; _caretPos.pos--;
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
ensureCaretVisible(); ensureCaretVisible();
invalidate(); } else if (_caretPos.line > 0) {
} _caretPos = _content.lineEnd(_caretPos.line - 1);
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
ensureCaretVisible();
}
return true; return true;
case EditorActions.Right: case EditorActions.Right:
case EditorActions.SelectRight: case EditorActions.SelectRight:
@ -562,7 +570,12 @@ class EditWidgetBase : WidgetGroup, EditableContentListener {
_caretPos.pos++; _caretPos.pos++;
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
ensureCaretVisible(); ensureCaretVisible();
} } else if (_caretPos.line < _content.length) {
_caretPos.pos = 0;
_caretPos.line++;
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
ensureCaretVisible();
}
return true; return true;
case EditorActions.DocumentBegin: case EditorActions.DocumentBegin:
case EditorActions.SelectDocumentBegin: case EditorActions.SelectDocumentBegin:
@ -645,6 +658,8 @@ class EditWidgetBase : WidgetGroup, EditableContentListener {
_content.performOperation(op); _content.performOperation(op);
} }
return true; return true;
default:
break;
} }
return super.handleAction(a); return super.handleAction(a);
} }