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

CaretRect in progress

This commit is contained in:
James Johnson 2018-01-11 09:59:15 -05:00
parent 72187063bd
commit d39fadd1d0
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dlangui/core/editable.d
View File

@ -452,8 +452,22 @@ struct LineSpan {
int len; int len;
/// the wrapping points /// the wrapping points
WrapPoint[] wrapPoints; WrapPoint[] wrapPoints;
/// the wrapped text
dstring[] wrappedContent; dstring[] wrappedContent;
int widthAccumulation(int wrapLine)
{
int widthTotal;
for (int i; i < wrapLine; i++)
{
if (i < this.wrapPoints.length - 1)
{
int curWidth = this.wrapPoints[i].wrapWidth;
widthTotal += curWidth;
}
}
return widthTotal;
}
} }
struct WrapPoint { struct WrapPoint {

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

@ -1264,6 +1264,8 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
handleAction(ACTION_EDITOR_SELECT_ALL); handleAction(ACTION_EDITOR_SELECT_ALL);
super.handleFocusChange(focused); super.handleFocusChange(focused);
} }
protected int _firstVisibleLine;
/// returns cursor rectangle /// returns cursor rectangle
protected Rect caretRect() { protected Rect caretRect() {
@ -1280,10 +1282,18 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
} }
} }
if (_wordWrap) if (_wordWrap)
{
_scrollPos.x = 0;
int wrapLine = findWrapLine(_caretPos);
int xOffset;
if (wrapLine > 0)
{ {
_scrollPos.x = 0; LineSpan curSpan = getSpan(_caretPos.line);
caretRc.offset(_clientRect.left, _clientRect.top); xOffset = curSpan.widthAccumulation(wrapLine);
} }
auto yOffset = -1 * _lineHeight * (wrapsUpTo(_caretPos.line - _firstVisibleLine) + wrapLine);
caretRc.offset(_clientRect.left - xOffset, _clientRect.top - yOffset);
}
else else
caretRc.offset(_clientRect.left, _clientRect.top); caretRc.offset(_clientRect.left, _clientRect.top);
return caretRc; return caretRc;
@ -2470,7 +2480,7 @@ class EditBox : EditWidgetBase {
} }
} }
protected int _firstVisibleLine; //protected int _firstVisibleLine;
protected int _maxLineWidth; protected int _maxLineWidth;
protected int _numVisibleLines; // number of lines visible in client area protected int _numVisibleLines; // number of lines visible in client area