From e58538de60b5d7fde1f2f1142ad08112f3788cdf Mon Sep 17 00:00:00 2001 From: James Johnson Date: Thu, 11 Jan 2018 10:09:51 -0500 Subject: [PATCH] Improved caret offset, put placeholder linespan into place --- src/dlangui/widgets/editors.d | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dlangui/widgets/editors.d b/src/dlangui/widgets/editors.d index 79f73803..1a5d68be 100644 --- a/src/dlangui/widgets/editors.d +++ b/src/dlangui/widgets/editors.d @@ -520,7 +520,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction LineSpan getSpan(int lineNumber) { - LineSpan lineSpan = LineSpan(lineNumber, 0, [], []); + LineSpan lineSpan = LineSpan(lineNumber, 0, [WrapPoint(0,0)], []); lineSpanIterate(delegate(LineSpan curSpan) { if (curSpan.start == lineNumber) @@ -1291,7 +1291,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction LineSpan curSpan = getSpan(_caretPos.line); 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); } else