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

edit marks

This commit is contained in:
Vadim Lopatin 2015-02-02 13:49:45 +03:00
parent 51c93a0424
commit f902ceb0b2
2 changed files with 43 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/dlangui/core/editable.d
View File

@ -367,6 +367,28 @@ class UndoBuffer {
} }
} }
/// returns true if saved state is in undo buffer
bool savedInUndo() {
if (!_savedState)
return false;
for (int i = 0; i < _undoList.length; i++) {
if (_savedState is _undoList[i])
return true;
}
return false;
}
/// returns true if saved state is in redo buffer
bool savedInRedo() {
if (!_savedState)
return false;
for (int i = 0; i < _redoList.length; i++) {
if (_savedState is _redoList[i])
return true;
}
return false;
}
/// returns true if content has been changed since last saved() or clear() call /// returns true if content has been changed since last saved() or clear() call
@property bool modified() { @property bool modified() {
return _savedState !is _undoList.peekBack; return _savedState !is _undoList.peekBack;
@ -736,8 +758,8 @@ class EditableContent {
} }
for (int i = after.start.line; i <= after.end.line; i++) { for (int i = after.start.line; i <= after.end.line; i++) {
if (marks) { if (marks) {
if (i - after.start.line < marks.length) //if (i - after.start.line < marks.length)
_editMarks[i] = marks[i - after.start.line]; _editMarks[i] = marks[i - after.start.line];
} }
dstring newline = newContent[i - after.start.line]; dstring newline = newContent[i - after.start.line];
if (i == after.start.line && i == after.end.line) { if (i == after.start.line && i == after.end.line) {
@ -748,7 +770,8 @@ class EditableContent {
//Log.d("merging lines ", firstLineHead, " ", newline, " ", lastLineTail); //Log.d("merging lines ", firstLineHead, " ", newline, " ", lastLineTail);
_lines[i] = cast(dstring)buf; _lines[i] = cast(dstring)buf;
clearTokenProps(i, i + 1); clearTokenProps(i, i + 1);
markChangedLines(i, i + 1); if (!marks)
markChangedLines(i, i + 1);
//Log.d("merge result: ", _lines[i]); //Log.d("merge result: ", _lines[i]);
} else if (i == after.start.line) { } else if (i == after.start.line) {
dchar[] buf; dchar[] buf;
@ -756,18 +779,21 @@ class EditableContent {
buf ~= newline; buf ~= newline;
_lines[i] = cast(dstring)buf; _lines[i] = cast(dstring)buf;
clearTokenProps(i, i + 1); clearTokenProps(i, i + 1);
markChangedLines(i, i + 1); if (!marks)
markChangedLines(i, i + 1);
} else if (i == after.end.line) { } else if (i == after.end.line) {
dchar[] buf; dchar[] buf;
buf ~= newline; buf ~= newline;
buf ~= lastLineTail; buf ~= lastLineTail;
_lines[i] = cast(dstring)buf; _lines[i] = cast(dstring)buf;
clearTokenProps(i, i + 1); clearTokenProps(i, i + 1);
markChangedLines(i, i + 1); if (!marks)
markChangedLines(i, i + 1);
} else { } else {
_lines[i] = newline; // no dup needed _lines[i] = newline; // no dup needed
clearTokenProps(i, i + 1); clearTokenProps(i, i + 1);
markChangedLines(i, i + 1); if (!marks)
markChangedLines(i, i + 1);
} }
} }
} }
@ -936,7 +962,7 @@ class EditableContent {
return _undoBuffer.hasRedo; return _undoBuffer.hasRedo;
} }
/// undoes last change /// undoes last change
bool undo() { bool undo(Object source) {
if (!hasUndo) if (!hasUndo)
return false; return false;
if (_readOnly) if (_readOnly)
@ -945,16 +971,16 @@ class EditableContent {
TextRange rangeBefore = op.newRange; TextRange rangeBefore = op.newRange;
dstring[] oldcontent = op.content; dstring[] oldcontent = op.content;
dstring[] newcontent = op.oldContent; dstring[] newcontent = op.oldContent;
EditStateMark[] newmarks = op.oldEditMarks; EditStateMark[] newmarks = _undoBuffer.savedInUndo() ? op.oldEditMarks : null;
TextRange rangeAfter = op.range; TextRange rangeAfter = op.range;
//Log.d("Undoing op rangeBefore=", rangeBefore, " contentBefore=`", oldcontent, "` rangeAfter=", rangeAfter, " contentAfter=`", newcontent, "`"); //Log.d("Undoing op rangeBefore=", rangeBefore, " contentBefore=`", oldcontent, "` rangeAfter=", rangeAfter, " contentAfter=`", newcontent, "`");
replaceRange(rangeBefore, rangeAfter, newcontent, newmarks); replaceRange(rangeBefore, rangeAfter, newcontent, newmarks);
handleContentChange(op, rangeBefore, rangeAfter, this); handleContentChange(op, rangeBefore, rangeAfter, source ? source : this);
return true; return true;
} }
/// redoes last undone change /// redoes last undone change
bool redo() { bool redo(Object source) {
if (!hasUndo) if (!hasUndo)
return false; return false;
if (_readOnly) if (_readOnly)
@ -966,7 +992,7 @@ class EditableContent {
TextRange rangeAfter = op.newRange; TextRange rangeAfter = op.newRange;
//Log.d("Redoing op rangeBefore=", rangeBefore, " contentBefore=`", oldcontent, "` rangeAfter=", rangeAfter, " contentAfter=`", newcontent, "`"); //Log.d("Redoing op rangeBefore=", rangeBefore, " contentBefore=`", oldcontent, "` rangeAfter=", rangeAfter, " contentAfter=`", newcontent, "`");
replaceRange(rangeBefore, rangeAfter, newcontent); replaceRange(rangeBefore, rangeAfter, newcontent);
handleContentChange(op, rangeBefore, rangeAfter, this); handleContentChange(op, rangeBefore, rangeAfter, source ? source : this);
return true; return true;
} }
/// clear undo/redp history /// clear undo/redp history

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

@ -631,8 +631,11 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
requestActionsUpdate(); requestActionsUpdate();
} }
} else { } else {
updateMaxLineWidth();
measureVisibleText();
correctCaretPos(); correctCaretPos();
// TODO: do something better (e.g. take into account ranges when correcting) requestLayout();
requestActionsUpdate();
} }
invalidate(); invalidate();
if (onModifiedStateChangeListener.assigned) { if (onModifiedStateChangeListener.assigned) {
@ -1073,14 +1076,14 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
{ {
if (readOnly) if (readOnly)
return true; return true;
_content.undo(); _content.undo(this);
} }
return true; return true;
case EditorActions.Redo: case EditorActions.Redo:
{ {
if (readOnly) if (readOnly)
return true; return true;
_content.redo(); _content.redo(this);
} }
return true; return true;
case EditorActions.Tab: case EditorActions.Tab: