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

fix scrollbars in editors

This commit is contained in:
Vadim Lopatin 2014-12-10 14:44:28 +03:00
parent 0e3d0db945
commit 72b344ef96
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1158,10 +1158,6 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
_lineHeight = font.height; _lineHeight = font.height;
} }
/// override to update scrollbars - if necessary
protected void updateScrollbars() {
}
/// when cursor position or selection is out of content bounds, fix it to nearest valid position /// when cursor position or selection is out of content bounds, fix it to nearest valid position
protected void correctCaretPos() { protected void correctCaretPos() {
_content.correctPosition(_caretPos); _content.correctPosition(_caretPos);
@ -1770,7 +1766,7 @@ class EditLine : EditWidgetBase {
_scrollPos.x += (rc.left - _clientRect.width) + _spaceWidth * 4; _scrollPos.x += (rc.left - _clientRect.width) + _spaceWidth * 4;
invalidate(); invalidate();
} }
updateScrollbars(); updateScrollBars();
} }
override protected Point measureVisibleText() { override protected Point measureVisibleText() {
@ -2038,7 +2034,7 @@ class EditBox : EditWidgetBase {
_scrollPos.x += (rc.left - _clientRect.width) + _clientRect.width / 4; _scrollPos.x += (rc.left - _clientRect.width) + _clientRect.width / 4;
invalidate(); invalidate();
} }
updateScrollbars(); updateScrollBars();
} }
override protected Rect textPosToClient(TextPosition p) { override protected Rect textPosToClient(TextPosition p) {
@ -2157,7 +2153,7 @@ class EditBox : EditWidgetBase {
_caretPos.line -= delta; _caretPos.line -= delta;
} }
measureVisibleText(); measureVisibleText();
updateScrollbars(); updateScrollBars();
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
} }
return true; return true;
@ -2175,7 +2171,7 @@ class EditBox : EditWidgetBase {
_caretPos.line += delta; _caretPos.line += delta;
} }
measureVisibleText(); measureVisibleText();
updateScrollbars(); updateScrollBars();
updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0); updateSelectionAfterCursorMovement(oldCaretPos, (a.id & 1) != 0);
} }
return true; return true;
@ -2186,7 +2182,7 @@ class EditBox : EditWidgetBase {
if (newpos < 0) if (newpos < 0)
newpos = 0; newpos = 0;
_scrollPos.x = newpos; _scrollPos.x = newpos;
updateScrollbars(); updateScrollBars();
invalidate(); invalidate();
} }
} }
@ -2198,7 +2194,7 @@ class EditBox : EditWidgetBase {
if (newpos > _maxLineWidth - _clientRect.width) if (newpos > _maxLineWidth - _clientRect.width)
newpos = _maxLineWidth - _clientRect.width; newpos = _maxLineWidth - _clientRect.width;
_scrollPos.x = newpos; _scrollPos.x = newpos;
updateScrollbars(); updateScrollBars();
invalidate(); invalidate();
} }
} }
@ -2210,7 +2206,7 @@ class EditBox : EditWidgetBase {
if (_firstVisibleLine < 0) if (_firstVisibleLine < 0)
_firstVisibleLine = 0; _firstVisibleLine = 0;
measureVisibleText(); measureVisibleText();
updateScrollbars(); updateScrollBars();
invalidate(); invalidate();
} }
} }
@ -2223,7 +2219,7 @@ class EditBox : EditWidgetBase {
if (_firstVisibleLine < 0) if (_firstVisibleLine < 0)
_firstVisibleLine = 0; _firstVisibleLine = 0;
measureVisibleText(); measureVisibleText();
updateScrollbars(); updateScrollBars();
invalidate(); invalidate();
} }
} }
@ -2238,7 +2234,7 @@ class EditBox : EditWidgetBase {
if (_firstVisibleLine < 0) if (_firstVisibleLine < 0)
_firstVisibleLine = 0; _firstVisibleLine = 0;
measureVisibleText(); measureVisibleText();
updateScrollbars(); updateScrollBars();
invalidate(); invalidate();
} }
} }
@ -2253,7 +2249,7 @@ class EditBox : EditWidgetBase {
if (_firstVisibleLine < 0) if (_firstVisibleLine < 0)
_firstVisibleLine = 0; _firstVisibleLine = 0;
measureVisibleText(); measureVisibleText();
updateScrollbars(); updateScrollBars();
invalidate(); invalidate();
} }
} }
@ -2267,7 +2263,7 @@ class EditBox : EditWidgetBase {
fontSize = cast(ushort)newFontSize; fontSize = cast(ushort)newFontSize;
updateFontProps(); updateFontProps();
measureVisibleText(); measureVisibleText();
updateScrollbars(); updateScrollBars();
invalidate(); invalidate();
} }
} }
@ -2282,7 +2278,7 @@ class EditBox : EditWidgetBase {
fontSize = cast(ushort)newFontSize; fontSize = cast(ushort)newFontSize;
updateFontProps(); updateFontProps();
measureVisibleText(); measureVisibleText();
updateScrollbars(); updateScrollBars();
invalidate(); invalidate();
} }
} }