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

EditBox - navigation is working

This commit is contained in:
Vadim Lopatin 2014-04-21 11:54:31 +04:00
parent d9162b7496
commit 5149ccfe3d
1 changed files with 133 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,7 +280,7 @@ class EditWidgetBase : WidgetGroup, EditableContentListener {
} else if (event.action == KeyAction.Text && event.text.length) { } else if (event.action == KeyAction.Text && event.text.length) {
Log.d("text entered: ", event.text); Log.d("text entered: ", event.text);
dchar ch = event.text[0]; dchar ch = event.text[0];
if (ch != 8) { // ignore Backspace if (ch != 8 && ch != '\n') { // ignore Backspace
EditOperation op = new EditOperation(EditAction.Insert, _caretPos, event.text); EditOperation op = new EditOperation(EditAction.Insert, _caretPos, event.text);
_content.performOperation(op); _content.performOperation(op);
return true; return true;
@ -547,7 +547,7 @@ class EditBox : EditWidgetBase {
} }
override bool onContentChange(EditableContent content, EditOperation operation, ref TextRange rangeBefore, ref TextRange rangeAfter) { override bool onContentChange(EditableContent content, EditOperation operation, ref TextRange rangeBefore, ref TextRange rangeAfter) {
//measureText(); measureVisibleText();
_caretPos = rangeAfter.end; _caretPos = rangeAfter.end;
invalidate(); invalidate();
return true; return true;
@ -555,31 +555,144 @@ class EditBox : EditWidgetBase {
override protected Rect textPosToClient(TextPosition p) { override protected Rect textPosToClient(TextPosition p) {
Rect res; Rect res;
//res.bottom = _clientRc.height; int lineIndex = p.line - _firstVisibleLine;
//if (p.pos == 0) res.top = lineIndex * _lineHeight;
// res.left = 0; res.bottom = res.top + _lineHeight;
//else if (p.pos >= _measuredText.length) if (lineIndex >=0 && lineIndex < _visibleLines.length) {
// res.left = _measuredTextSize.x; if (p.pos == 0)
//else res.left = 0;
// res.left = _measuredTextWidths[p.pos - 1]; else if (p.pos >= _visibleLinesMeasurement[lineIndex].length)
//res.right = res.left + 1; res.left = _visibleLinesWidths[lineIndex];
else
res.left = _visibleLinesMeasurement[lineIndex][p.pos - 1];
}
res.right = res.left + 1;
return res; return res;
} }
override protected TextPosition clientToTextPos(Point pt) { override protected TextPosition clientToTextPos(Point pt) {
TextPosition res; TextPosition res;
//for (int i = 0; i < _measuredText.length; i++) { int lineIndex = pt.y / _lineHeight;
// int x0 = i > 0 ? _measuredTextWidths[i - 1] : 0; if (lineIndex < 0)
// int x1 = _measuredTextWidths[i]; lineIndex = 0;
// int mx = (x0 + x1) >> 1; if (lineIndex < _visibleLines.length) {
// if (pt.x < mx) { res.line = lineIndex + _firstVisibleLine;
// res.pos = i; for (int i = 0; i < _visibleLinesMeasurement[lineIndex].length; i++) {
// return res; int x0 = i > 0 ? _visibleLinesMeasurement[lineIndex][i - 1] : 0;
// } int x1 = _visibleLinesMeasurement[lineIndex][i];
//} int mx = (x0 + x1) >> 1;
//res.pos = _measuredText.length; if (pt.x < mx) {
res.pos = i;
return res; return res;
} }
}
res.pos = _visibleLines[lineIndex].length;
} else {
res.line = _firstVisibleLine + _visibleLines.length - 1;
res.pos = _visibleLines[$ - 1].length;
}
return res;
}
protected void correctCaretPos() {
if (_caretPos.line >= _content.length)
_caretPos.line = _content.length - 1;
if (_caretPos.line < 0)
_caretPos.line = 0;
dstring currentLine = _content[_caretPos.line];
if (_caretPos.pos > currentLine.length)
_caretPos.pos = currentLine.length;
if (_caretPos.pos < 0)
_caretPos.pos = 0;
}
override protected bool handleAction(Action a) {
dstring currentLine = _content[_caretPos.line];
switch (a.id) {
case EditorActions.Left:
correctCaretPos();
if (_caretPos.pos > 0) {
_caretPos.pos--;
invalidate();
}
return true;
case EditorActions.Right:
correctCaretPos();
if (_caretPos.pos < currentLine.length) {
_caretPos.pos++;
invalidate();
}
return true;
case EditorActions.DelPrevChar:
correctCaretPos();
if (_caretPos.pos > 0) {
TextRange range = TextRange(_caretPos, _caretPos);
range.start.pos--;
EditOperation op = new EditOperation(EditAction.Delete, range, null);
_content.performOperation(op);
}
return true;
case EditorActions.DelNextChar:
correctCaretPos();
if (_caretPos.pos < currentLine.length) {
TextRange range = TextRange(_caretPos, _caretPos);
range.end.pos++;
EditOperation op = new EditOperation(EditAction.Delete, range, null);
_content.performOperation(op);
}
return true;
case EditorActions.Up:
if (_caretPos.line > 0) {
_caretPos.line--;
invalidate();
}
return true;
case EditorActions.Down:
if (_caretPos.line < _content.length - 1) {
_caretPos.line++;
invalidate();
}
return true;
case EditorActions.WordLeft:
break;
case EditorActions.WordRight:
break;
case EditorActions.PageUp:
break;
case EditorActions.PageDown:
break;
case EditorActions.DocumentBegin:
if (_caretPos.pos > 0 || _caretPos.line > 0) {
_caretPos.line = 0;
_caretPos.pos = 0;
invalidate();
}
return true;
case EditorActions.LineBegin:
if (_caretPos.pos > 0) {
_caretPos.pos = 0;
invalidate();
}
return true;
case EditorActions.DocumentEnd:
if (_caretPos.line < _content.length - 1 || _caretPos.pos < _content[_content.length - 1].length) {
_caretPos.line = _content.length - 1;
_caretPos.pos = _content[_content.length - 1].length;
invalidate();
}
return true;
case EditorActions.LineEnd:
if (_caretPos.pos < currentLine.length) {
_caretPos.pos = currentLine.length;
invalidate();
}
return true;
default:
return false;
}
return super.handleAction(a);
}
/// measure /// measure
override void measure(int parentWidth, int parentHeight) { override void measure(int parentWidth, int parentHeight) {