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

implemented #265

This commit is contained in:
Vadim Lopatin 2016-06-08 09:48:39 +03:00
parent 7293b917c4
commit 76a631ebff
1 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,11 +268,26 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
/// when true, call measureVisibileText on next layout /// when true, call measureVisibileText on next layout
protected bool _contentChanged = true; protected bool _contentChanged = true;
protected bool _copyCurrentLineWhenNoSelection = true;
/// when true allows copy / cut whole current line if there is no selection
@property bool copyCurrentLineWhenNoSelection() { return _copyCurrentLineWhenNoSelection; }
@property EditWidgetBase copyCurrentLineWhenNoSelection(bool flg) { _copyCurrentLineWhenNoSelection = flg; return this; }
protected bool _showTabPositionMarks = true;
/// when true shows mark on tab positions in beginning of line
@property bool showTabPositionMarks() { return _showTabPositionMarks; }
@property EditWidgetBase showTabPositionMarks(bool flg) {
if (flg != _showTabPositionMarks) {
_showTabPositionMarks = flg;
invalidate();
}
return this;
}
/// Modified state change listener (e.g. content has been saved, or first time modified after save) /// Modified state change listener (e.g. content has been saved, or first time modified after save)
Signal!ModifiedStateListener modifiedStateChange; Signal!ModifiedStateListener modifiedStateChange;
/// editor content is changed /// Signal to emit when editor content is changed
Signal!EditableContentChangeListener contentChange; Signal!EditableContentChangeListener contentChange;
/// override to support modification of client rect after change, e.g. apply offset /// override to support modification of client rect after change, e.g. apply offset
@ -575,7 +590,6 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
return focusable && visible; return focusable && visible;
} }
/// override to change popup menu items state /// override to change popup menu items state
override bool isActionEnabled(const Action action) { override bool isActionEnabled(const Action action) {
switch (action.id) with(EditorActions) switch (action.id) with(EditorActions)
@ -586,9 +600,9 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
case Unindent: case Unindent:
return enabled; return enabled;
case Copy: case Copy:
return !_selectionRange.empty; return _copyCurrentLineWhenNoSelection || !_selectionRange.empty;
case Cut: case Cut:
return enabled && !_selectionRange.empty; return enabled && (_copyCurrentLineWhenNoSelection || !_selectionRange.empty);
case Paste: case Paste:
return enabled && Platform.instance.getClipboardText().length > 0; return enabled && Platform.instance.getClipboardText().length > 0;
case Undo: case Undo:
@ -634,7 +648,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
/// set bool property value, for ML loaders /// set bool property value, for ML loaders
mixin(generatePropertySettersMethodOverride("setBoolProperty", "bool", mixin(generatePropertySettersMethodOverride("setBoolProperty", "bool",
"wantTabs", "showIcons", "showFolding", "showModificationMarks", "showLineNumbers", "readOnly", "replaceMode", "useSpacesForTabs")); "wantTabs", "showIcons", "showFolding", "showModificationMarks", "showLineNumbers", "readOnly", "replaceMode", "useSpacesForTabs", "copyCurrentLineWhenNoSelection", "showTabPositionMarks"));
/// set int property value, for ML loaders /// set int property value, for ML loaders
mixin(generatePropertySettersMethodOverride("setIntProperty", "int", mixin(generatePropertySettersMethodOverride("setIntProperty", "int",
@ -1135,11 +1149,22 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
return true; return true;
} }
public dstring getSelectedText(){ /// returns current selection text (joined with LF when span over multiple lines)
dstring selectionText = concatDStrings(_content.rangeText(_selectionRange)); public dstring getSelectedText() {
return getRangeText(_selectionRange);
}
/// returns text for specified range (joined with LF when span over multiple lines)
public dstring getRangeText(TextRange range) {
dstring selectionText = concatDStrings(_content.rangeText(range));
return selectionText; return selectionText;
} }
/// returns range for line with cursor
@property public TextRange currentLineRange() {
return _content.lineRange(_caretPos.line);
}
protected bool removeRangeText(TextRange range) { protected bool removeRangeText(TextRange range) {
if (range.empty) if (range.empty)
return false; return false;
@ -1338,19 +1363,18 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
} }
return true; return true;
case Copy: case Copy:
if (!_selectionRange.empty) {
dstring selectionText = getSelectedText();
platform.setClipboardText(selectionText);
}
return true;
case Cut: case Cut:
if (!_selectionRange.empty) { TextRange range = _selectionRange;
dstring selectionText = getSelectedText(); if (range.empty && _copyCurrentLineWhenNoSelection) {
range = currentLineRange;
}
if (!range.empty) {
dstring selectionText = getRangeText(range);
platform.setClipboardText(selectionText); platform.setClipboardText(selectionText);
if (readOnly) if (!readOnly && a.id == Cut) {
return true; EditOperation op = new EditOperation(EditAction.Replace, range, [""d]);
EditOperation op = new EditOperation(EditAction.Replace, _selectionRange, [""d]); _content.performOperation(op, this);
_content.performOperation(op, this); }
} }
return true; return true;
case Paste: case Paste: