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

Merge pull request #298 from default0/master 

Call correctCaretPos() after keyboard navigation
This commit is contained in:
Vadim Lopatin 2016-10-03 16:23:56 +04:00 committed by GitHub
parent 6328b11286 2da2f24f58
commit 6903554b0f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2390,6 +2390,7 @@ class EditBox : EditWidgetBase {
case SelectUp: case SelectUp:
if (_caretPos.line > 0) { if (_caretPos.line > 0) {
_caretPos.line--; _caretPos.line--;
correctCaretPos();
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
ensureCaretVisible(); ensureCaretVisible();
} }
@ -2398,6 +2399,7 @@ class EditBox : EditWidgetBase {
case SelectDown: case SelectDown:
if (_caretPos.line < _content.length - 1) { if (_caretPos.line < _content.length - 1) {
_caretPos.line++; _caretPos.line++;
correctCaretPos();
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
ensureCaretVisible(); ensureCaretVisible();
} }
@ -2407,6 +2409,7 @@ class EditBox : EditWidgetBase {
{ {
ensureCaretVisible(); ensureCaretVisible();
_caretPos.line = _firstVisibleLine; _caretPos.line = _firstVisibleLine;
correctCaretPos();
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
} }
return true; return true;
@ -2419,6 +2422,7 @@ class EditBox : EditWidgetBase {
if (newpos >= _content.length) if (newpos >= _content.length)
newpos = _content.length - 1; newpos = _content.length - 1;
_caretPos.line = newpos; _caretPos.line = newpos;
correctCaretPos();
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
} }
return true; return true;
@ -2436,6 +2440,7 @@ class EditBox : EditWidgetBase {
_firstVisibleLine = newpos; _firstVisibleLine = newpos;
_caretPos.line -= delta; _caretPos.line -= delta;
} }
correctCaretPos();
measureVisibleText(); measureVisibleText();
updateScrollBars(); updateScrollBars();
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
@ -2454,6 +2459,7 @@ class EditBox : EditWidgetBase {
_firstVisibleLine = newpos; _firstVisibleLine = newpos;
_caretPos.line += delta; _caretPos.line += delta;
} }
correctCaretPos();
measureVisibleText(); measureVisibleText();
updateScrollBars(); updateScrollBars();
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);