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

Proper mouse selection scrolling implementation. Fixes #645 

Properly implemented `EditLine` horizontal scrolling and `EditBox` scrolling (both vertical and horizontal) when selection with mouse is active and the caret goes outside of the edit widget boundaries.
This commit is contained in:
Ermiq 2023-09-16 14:38:00 +05:00 committed by GitHub
parent 645b9d87c0
commit 73e8cb4dd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,12 +180,8 @@ enum EditorActions : int {
// Scroll operations // Scroll operations
/// Scroll one line up (not changing cursor) /// Scroll one line up (not changing cursor)
ScrollLineUpSingle,
/// Scroll one line down (not changing cursor)
ScrollLineDownSingle,
/// Scroll three lines up (not changing cursor)
ScrollLineUp, ScrollLineUp,
/// Scroll three lines down (not changing cursor) /// Scroll one line down (not changing cursor)
ScrollLineDown, ScrollLineDown,
/// Scroll one page up (not changing cursor) /// Scroll one page up (not changing cursor)
ScrollPageUp, ScrollPageUp,
@ -821,8 +817,8 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
new Action(EditorActions.DocumentEnd, KeyCode.END, KeyFlag.Control, ActionStateUpdateFlag.never), new Action(EditorActions.DocumentEnd, KeyCode.END, KeyFlag.Control, ActionStateUpdateFlag.never),
new Action(EditorActions.SelectDocumentEnd, KeyCode.END, KeyFlag.Control | KeyFlag.Shift, ActionStateUpdateFlag.never), new Action(EditorActions.SelectDocumentEnd, KeyCode.END, KeyFlag.Control | KeyFlag.Shift, ActionStateUpdateFlag.never),
new Action(EditorActions.ScrollLineUpSingle, KeyCode.UP, KeyFlag.Control, ActionStateUpdateFlag.never), new Action(EditorActions.ScrollLineUp, KeyCode.UP, KeyFlag.Control, ActionStateUpdateFlag.never),
new Action(EditorActions.ScrollLineDownSingle, KeyCode.DOWN, KeyFlag.Control, ActionStateUpdateFlag.never), new Action(EditorActions.ScrollLineDown, KeyCode.DOWN, KeyFlag.Control, ActionStateUpdateFlag.never),
// Backspace/Del // Backspace/Del
new Action(EditorActions.DelPrevChar, KeyCode.BACK, 0, ActionStateUpdateFlag.never), new Action(EditorActions.DelPrevChar, KeyCode.BACK, 0, ActionStateUpdateFlag.never),
@ -1464,14 +1460,12 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
} }
/// Used instead of using clientToTextPos for mouse input when in word wrap mode /// Used instead of using clientToTextPos for mouse input when in word wrap mode
protected TextPosition wordWrapMouseOffset(int x, int y) protected TextPosition wordWrapMouseOffset(int x, int y) {
{ if (y < 0 || _span.length == 0)
if(_span.length == 0)
return clientToTextPos(Point(x,y)); return clientToTextPos(Point(x,y));
int selectedVisibleLine = y / _lineHeight; int selectedVisibleLine = y / _lineHeight;
LineSpan _curSpan; LineSpan _curSpan;
int wrapLine = 0; int wrapLine = 0;
int curLine = 0; int curLine = 0;
bool foundWrap = false; bool foundWrap = false;
@ -1503,7 +1497,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
}); });
int fakeLineHeight = curLine * _lineHeight; int fakeLineHeight = curLine * _lineHeight;
return clientToTextPos(Point(x + accumulativeWidths,fakeLineHeight)); return clientToTextPos(Point(x + accumulativeWidths, fakeLineHeight));
} }
protected void selectWordByMouse(int x, int y) { protected void selectWordByMouse(int x, int y) {
@ -2209,12 +2203,7 @@ class EditWidgetBase : ScrollWidgetBase, EditableContentListener, MenuItemAction
} }
if (event.action == MouseAction.Move && (event.flags & MouseButton.Left) != 0) { if (event.action == MouseAction.Move && (event.flags & MouseButton.Left) != 0) {
updateCaretPositionByMouse(event.x - _clientRect.left, event.y - _clientRect.top, true); updateCaretPositionByMouse(event.x - _clientRect.left, event.y - _clientRect.top, true);
if (event.y < _clientRect.top) { ensureCaretVisible();
handleAction(new Action(EditorActions.ScrollLineUpSingle));
}
else if (event.y > _clientRect.bottom) {
handleAction(new Action(EditorActions.ScrollLineDownSingle));
}
return true; return true;
} }
if (event.action == MouseAction.Move && event.flags == 0) { if (event.action == MouseAction.Move && event.flags == 0) {
@ -2381,13 +2370,13 @@ class EditLine : EditWidgetBase {
Rect rc = textPosToClient(_caretPos); Rect rc = textPosToClient(_caretPos);
if (rc.left < 0) { if (rc.left < 0) {
// scroll left // scroll left
_scrollPos.x -= -rc.left + _clientRect.width / 10; _scrollPos.x += rc.left - _spaceWidth * 4;
if (_scrollPos.x < 0) if (_scrollPos.x < 0)
_scrollPos.x = 0; _scrollPos.x = 0;
invalidate(); invalidate();
} else if (rc.left >= _clientRect.width - 10) { } else if (rc.left >= _clientRect.width - _spaceWidth * 4) {
// scroll right // scroll right
_scrollPos.x += (rc.left - _clientRect.width) + _spaceWidth * 4; _scrollPos.x += rc.left - _clientRect.width + _spaceWidth * 4;
invalidate(); invalidate();
} }
updateScrollBars(); updateScrollBars();
@ -2927,9 +2916,9 @@ class EditBox : EditWidgetBase {
} else if (event.action == ScrollAction.PageDown) { } else if (event.action == ScrollAction.PageDown) {
dispatchAction(new Action(EditorActions.ScrollPageDown)); dispatchAction(new Action(EditorActions.ScrollPageDown));
} else if (event.action == ScrollAction.LineUp) { } else if (event.action == ScrollAction.LineUp) {
dispatchAction(new Action(EditorActions.ScrollLineUpSingle)); dispatchAction(new Action(EditorActions.ScrollLineUp));
} else if (event.action == ScrollAction.LineDown) { } else if (event.action == ScrollAction.LineDown) {
dispatchAction(new Action(EditorActions.ScrollLineDownSingle)); dispatchAction(new Action(EditorActions.ScrollLineDown));
} }
return true; return true;
} }
@ -2997,14 +2986,14 @@ class EditBox : EditWidgetBase {
Rect rc = textPosToClient(_caretPos); Rect rc = textPosToClient(_caretPos);
if (rc.left < 0) { if (rc.left < 0) {
// scroll left // scroll left
_scrollPos.x -= -rc.left + _clientRect.width / 4; _scrollPos.x += rc.left - _spaceWidth * 4;
if (_scrollPos.x < 0) if (_scrollPos.x < 0)
_scrollPos.x = 0; _scrollPos.x = 0;
invalidate(); invalidate();
} else if (rc.left >= _clientRect.width - 10) { } else if (rc.left >= _clientRect.width - _spaceWidth * 4) {
// scroll right // scroll right
if (!_wordWrap) if (!_wordWrap)
_scrollPos.x += (rc.left - _clientRect.width) + _clientRect.width / 4; _scrollPos.x += rc.left - _clientRect.width + _spaceWidth * 4;
invalidate(); invalidate();
} }
updateScrollBars(); updateScrollBars();
@ -3033,9 +3022,13 @@ class EditBox : EditWidgetBase {
override protected TextPosition clientToTextPos(Point pt) { override protected TextPosition clientToTextPos(Point pt) {
TextPosition res; TextPosition res;
pt.x += _scrollPos.x; pt.x += _scrollPos.x;
// if the point is above the first visible line
if (pt.y < 0) {
res.line = _firstVisibleLine > 0 ? _firstVisibleLine - 1 : _firstVisibleLine;
res.pos = 0;
return res;
}
int lineIndex = pt.y / _lineHeight; int lineIndex = pt.y / _lineHeight;
if (lineIndex < 0)
lineIndex = 0;
if (lineIndex < _visibleLines.length) { if (lineIndex < _visibleLines.length) {
res.line = lineIndex + _firstVisibleLine; res.line = lineIndex + _firstVisibleLine;
int len = cast(int)_visibleLines[lineIndex].length; int len = cast(int)_visibleLines[lineIndex].length;
@ -3250,18 +3243,6 @@ class EditBox : EditWidgetBase {
} }
} }
return true; return true;
case ScrollLineUpSingle:
{
if (_firstVisibleLine > 0) {
_firstVisibleLine -= 1;
if (_firstVisibleLine < 0)
_firstVisibleLine = 0;
measureVisibleText();
updateScrollBars();
invalidate();
}
}
return true;
case ScrollPageUp: case ScrollPageUp:
{ {
int fullLines = _clientRect.height / _lineHeight; int fullLines = _clientRect.height / _lineHeight;
@ -3290,21 +3271,6 @@ class EditBox : EditWidgetBase {
} }
} }
return true; return true;
case ScrollLineDownSingle:
{
int fullLines = _clientRect.height / _lineHeight;
if (_firstVisibleLine + fullLines < _content.length) {
_firstVisibleLine += 1;
if (_firstVisibleLine > _content.length - fullLines)
_firstVisibleLine = _content.length - fullLines;
if (_firstVisibleLine < 0)
_firstVisibleLine = 0;
measureVisibleText();
updateScrollBars();
invalidate();
}
}
return true;
case ScrollPageDown: case ScrollPageDown:
{ {
int fullLines = _clientRect.height / _lineHeight; int fullLines = _clientRect.height / _lineHeight;