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

editbox fixes

This commit is contained in:
Vadim Lopatin 2014-04-22 13:54:47 +04:00
parent a2a146e11b
commit 3d01c1515f
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dlangui/graphics/drawbuf.d
View File

@ -326,7 +326,7 @@ class DrawBuf : RefCountedObject {
fillRect(r, frameColor); fillRect(r, frameColor);
// top side // top side
r = rc; r = rc;
r.left -= frameSideWidths.left; r.left += frameSideWidths.left;
r.right -= frameSideWidths.right; r.right -= frameSideWidths.right;
Rect rc2 = r; Rect rc2 = r;
rc2.bottom = r.top + frameSideWidths.top; rc2.bottom = r.top + frameSideWidths.top;

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

@ -945,6 +945,15 @@ class EditBox : EditWidgetBase, OnScrollHandler {
updateScrollbars(); updateScrollbars();
} }
/// override to custom highlight of line background
protected void drawLineBackground(DrawBuf buf, int lineIndex, Rect lineRect, Rect visibleRect) {
if (lineIndex & 1)
buf.fillRect(visibleRect, 0xF4808080);
if (lineIndex == _caretPos.line) {
buf.drawFrame(visibleRect, 0xA0808080, Rect(1,1,1,1));
}
}
/// draw content /// draw content
override void onDraw(DrawBuf buf) { override void onDraw(DrawBuf buf) {
if (visibility != Visibility.Visible) if (visibility != Visibility.Visible)
@ -961,8 +970,18 @@ class EditBox : EditWidgetBase, OnScrollHandler {
//font.drawText(buf, rc.left, rc.top + sz.y / 10, txt, textColor); //font.drawText(buf, rc.left, rc.top + sz.y / 10, txt, textColor);
for (int i = 0; i < _visibleLines.length; i++) { for (int i = 0; i < _visibleLines.length; i++) {
dstring txt = _visibleLines[i]; dstring txt = _visibleLines[i];
if (txt.length > 0) Rect lineRect = rc;
lineRect.left = _clientRc.left - _scrollPos.x;
lineRect.right = lineRect.left + calcLineWidth(_content[_firstVisibleLine + i]);
lineRect.top = _clientRc.top + i * _lineHeight;
lineRect.bottom = lineRect.top + _lineHeight;
Rect visibleRect = lineRect;
visibleRect.left = _clientRc.left;
visibleRect.right = _clientRc.right;
drawLineBackground(buf, _firstVisibleLine + i, lineRect, visibleRect);
if (txt.length > 0) {
font.drawText(buf, rc.left - _scrollPos.x, rc.top + i * _lineHeight, txt, textColor); font.drawText(buf, rc.left - _scrollPos.x, rc.top + i * _lineHeight, txt, textColor);
}
} }
//buf.fillRect(_clientRc, 0x80E0E0FF); // testing clientRc //buf.fillRect(_clientRc, 0x80E0E0FF); // testing clientRc