feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Editor: Prevent setting negative position in block selection

Browse Source 
Fixes: QTCREATORBUG-23622
Change-Id: I0f041a772869695e7d460effd4b0d58f94ce55ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-02-25 10:00:12 +01:00
parent aee78bd58d
commit 63e9c4c31a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/texteditor/texteditor.cpp
View File

@@ -5466,7 +5466,7 @@ void TextEditorWidget::mouseMoveEvent(QMouseEvent *e)
column += (e->pos().x() - cursorRect().center().x()) / QFontMetricsF(font()).horizontalAdvance(QLatin1Char(' ')); column += (e->pos().x() - cursorRect().center().x()) / QFontMetricsF(font()).horizontalAdvance(QLatin1Char(' '));
d->m_blockSelection.positionBlock = cursor.blockNumber(); d->m_blockSelection.positionBlock = cursor.blockNumber();
d->m_blockSelection.positionColumn = column; d->m_blockSelection.positionColumn = qMax(0, column);
doSetTextCursor(d->m_blockSelection.selection(d->m_document.data()), true); doSetTextCursor(d->m_blockSelection.selection(d->m_document.data()), true);
viewport()->update(); viewport()->update();
@@ -8035,12 +8035,12 @@ QTextCursor TextBlockSelection::cursor(const TextDocument *baseTextDocument,
} }
void TextBlockSelection::fromPostition(int positionBlock, int positionColumn, void TextBlockSelection::fromPostition(int positionBlock, int positionColumn,
int anchorBlock, int anchorColumn) int anchorBlock, int anchorColumn)
{ {
this->positionBlock = positionBlock; this->positionBlock = QTC_GUARD(positionBlock >= 0) ? positionBlock : 0;
this->positionColumn = positionColumn; this->positionColumn = QTC_GUARD(positionColumn >= 0) ? positionColumn : 0;
this->anchorBlock = anchorBlock; this->anchorBlock = QTC_GUARD(anchorBlock >= 0) ? anchorBlock : 0;
this->anchorColumn = anchorColumn; this->anchorColumn = QTC_GUARD(anchorColumn >= 0) ? anchorColumn : 0;
} }
bool TextEditorWidget::inFindScope(const QTextCursor &cursor) bool TextEditorWidget::inFindScope(const QTextCursor &cursor)