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

Improved caret offset, put placeholder linespan into place

This commit is contained in:
James Johnson 2018-01-11 10:09:51 -05:00
parent d39fadd1d0
commit e58538de60
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -520,7 +520,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
LineSpan getSpan(int lineNumber) LineSpan getSpan(int lineNumber)
{ {
LineSpan lineSpan = LineSpan(lineNumber, 0, [], []); LineSpan lineSpan = LineSpan(lineNumber, 0, [WrapPoint(0,0)], []);
lineSpanIterate(delegate(LineSpan curSpan) lineSpanIterate(delegate(LineSpan curSpan)
{ {
if (curSpan.start == lineNumber) if (curSpan.start == lineNumber)
@ -1291,7 +1291,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
LineSpan curSpan = getSpan(_caretPos.line); LineSpan curSpan = getSpan(_caretPos.line);
xOffset = curSpan.widthAccumulation(wrapLine); xOffset = curSpan.widthAccumulation(wrapLine);
} }
auto yOffset = -1 * _lineHeight * (wrapsUpTo(_caretPos.line - _firstVisibleLine) + wrapLine); auto yOffset = -1 * _lineHeight * (wrapsUpTo(_caretPos.line) + wrapLine);
caretRc.offset(_clientRect.left - xOffset, _clientRect.top - yOffset); caretRc.offset(_clientRect.left - xOffset, _clientRect.top - yOffset);
} }
else else