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

editbox: allow backspace/del to merge lines

This commit is contained in:
Vadim Lopatin 2014-04-22 16:41:05 +04:00
parent e877cf54d3
commit bf8864da1a
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,8 +233,8 @@ class EditableContent {
/// inserts or removes lines, removes text in range /// inserts or removes lines, removes text in range
protected void replaceRange(TextRange before, TextRange after, dstring[] newContent) { protected void replaceRange(TextRange before, TextRange after, dstring[] newContent) {
dstring firstLineBefore = line(before.start.line); dstring firstLineBefore = line(before.start.line);
dstring lastLineBefore = before.singleLine ? line(before.end.line) : firstLineBefore; dstring lastLineBefore = before.singleLine ? firstLineBefore : line(before.end.line);
dstring firstLineHead = before.start.pos > 0 && before.start.pos < firstLineBefore.length ? firstLineBefore[0..before.start.pos] : ""d; dstring firstLineHead = before.start.pos > 0 && before.start.pos <= firstLineBefore.length ? firstLineBefore[0..before.start.pos] : ""d;
dstring lastLineTail = before.end.pos >= 0 && before.end.pos < lastLineBefore.length ? lastLineBefore[before.end.pos .. $] : ""d; dstring lastLineTail = before.end.pos >= 0 && before.end.pos < lastLineBefore.length ? lastLineBefore[before.end.pos .. $] : ""d;
int linesBefore = before.lines; int linesBefore = before.lines;
@ -978,6 +978,7 @@ class EditBox : EditWidgetBase, OnScrollHandler {
return true; return true;
case EditorActions.DelPrevChar: case EditorActions.DelPrevChar:
if (!_selectionRange.empty) { if (!_selectionRange.empty) {
// clear selection
EditOperation op = new EditOperation(EditAction.Replace, _selectionRange, [""d]); EditOperation op = new EditOperation(EditAction.Replace, _selectionRange, [""d]);
_content.performOperation(op); _content.performOperation(op);
ensureCaretVisible(); ensureCaretVisible();
@ -985,10 +986,19 @@ class EditBox : EditWidgetBase, OnScrollHandler {
} }
correctCaretPos(); correctCaretPos();
if (_caretPos.pos > 0) { if (_caretPos.pos > 0) {
// delete prev char in current line
TextRange range = TextRange(_caretPos, _caretPos); TextRange range = TextRange(_caretPos, _caretPos);
range.start.pos--; range.start.pos--;
EditOperation op = new EditOperation(EditAction.Replace, range, [""d]); EditOperation op = new EditOperation(EditAction.Replace, range, [""d]);
_content.performOperation(op); _content.performOperation(op);
} else if (_caretPos.line > 0) {
// merge with previous line
TextRange range = TextRange(_caretPos, _caretPos);
range.start.line--;
dstring prevLine = _content[range.start.line];
range.start.pos = cast(int)prevLine.length;
EditOperation op = new EditOperation(EditAction.Replace, range, [""d]);
_content.performOperation(op);
} }
return true; return true;
case EditorActions.DelNextChar: case EditorActions.DelNextChar:
@ -999,10 +1009,18 @@ class EditBox : EditWidgetBase, OnScrollHandler {
} }
correctCaretPos(); correctCaretPos();
if (_caretPos.pos < currentLine.length) { if (_caretPos.pos < currentLine.length) {
// delete char in current line
TextRange range = TextRange(_caretPos, _caretPos); TextRange range = TextRange(_caretPos, _caretPos);
range.end.pos++; range.end.pos++;
EditOperation op = new EditOperation(EditAction.Replace, range, [""d]); EditOperation op = new EditOperation(EditAction.Replace, range, [""d]);
_content.performOperation(op); _content.performOperation(op);
} else if (_caretPos.line < _content.length - 1) {
// merge with next line
TextRange range = TextRange(_caretPos, _caretPos);
range.end.line++;
range.end.pos = 0;
EditOperation op = new EditOperation(EditAction.Replace, range, [""d]);
_content.performOperation(op);
} }
return true; return true;
case EditorActions.InsertNewLine: case EditorActions.InsertNewLine: