Commit 0236ef3b authored by Nate Graham's avatar Nate Graham
Browse files

Revert "Fix crash in extendSelection"

This reverts commit ef3773b8.

This change caused a critical regression in the stable branch: https://bugs.kde.org/show_bug.cgi?id=403117

BUG: 403117
FIXED-IN: 18.12.2

CCMAIL: pas.anddev@gmail.com
CCMAIL: kurt.hindenburg@gmail.com
parent f9c85fed
......@@ -2552,20 +2552,14 @@ void TerminalDisplay::extendSelection(const QPoint& position)
int charColumn = 0;
int charLine = 0;
getCharacterPosition(pos, charLine, charColumn, !_wordSelectionMode && !_lineSelectionMode);
getCharacterPosition(pos, charLine, charColumn, true);
QPoint here = QPoint(charColumn, charLine);
here.rx() = qBound(0, here.x(), _columns - 1);
here.ry() = qBound(0, here.y(), _lines - 1);
QPoint ohere;
QPoint _iPntSelCorr = _iPntSel;
_iPntSelCorr.ry() -= _scrollBar->value();
_iPntSelCorr.rx() = qBound(0, _iPntSelCorr.x(), _columns - 1);
_iPntSelCorr.ry() = qBound(0, _iPntSelCorr.y(), _lines - 1);
QPoint _pntSelCorr = _pntSel;
_pntSelCorr.ry() -= _scrollBar->value();
_pntSelCorr.rx() = qBound(0, _pntSelCorr.x(), _columns - 1);
_pntSelCorr.ry() = qBound(0, _pntSelCorr.y(), _lines - 1);
bool swapping = false;
if (_wordSelectionMode) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment