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

Editor: Fix drop location marker

Browse Source 
Change-Id: Id63ff9e8089fd8aaf38fb61ff6d79384a60135d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2021-11-03 12:52:32 +01:00
parent e96c664fce
commit fe9e8417f2
2 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -768,6 +768,7 @@ public:
bool m_markDragging = false;
QCursor m_markDragCursor;
TextMark* m_dragMark = nullptr;
QTextCursor m_dndCursor;
QScopedPointer<ClipboardAssistProvider> m_clipboardAssistProvider;
@@ -4298,9 +4299,18 @@ void TextEditorWidgetPrivate::addCursorsPosition(PaintEventData &data,
QPainter &painter,
const PaintEventBlockData &blockData) const
{
if (!m_dndCursor.isNull()) {
if (blockContainsCursor(blockData, m_dndCursor)) {
data.cursors.append(
generateCursorData(m_dndCursor.positionInBlock(), data, blockData, painter));
}
} else {
for (const QTextCursor &cursor : m_cursors) {
if (blockContainsCursor(blockData, cursor))
data.cursors.append(generateCursorData(cursor.positionInBlock(), data, blockData, painter));
if (blockContainsCursor(blockData, cursor)) {
data.cursors.append(
generateCursorData(cursor.positionInBlock(), data, blockData, painter));
}
}
}
}
@@ -4377,13 +4387,17 @@ void TextEditorWidget::paintEvent(QPaintEvent *e)
d->paintCurrentLineHighlight(data, painter);
bool drawCursor = d->m_cursorVisible
&& Utils::anyOf(d->m_cursors,
[&](const QTextCursor &cursor) {
bool drawCursor = false;
bool drawCursorAsBlock = false;
if (d->m_dndCursor.isNull()) {
drawCursor = d->m_cursorVisible
&& Utils::anyOf(d->m_cursors, [&](const QTextCursor &cursor) {
return blockContainsCursor(blockData, cursor);
});
bool drawCursorAsBlock = drawCursor && overwriteMode();
drawCursorAsBlock = drawCursor && overwriteMode();
} else {
drawCursor = blockContainsCursor(blockData, d->m_dndCursor);
}
if (drawCursorAsBlock) {
for (const QTextCursor &cursor : multiTextCursor()) {
@@ -7375,8 +7389,29 @@ void TextEditorWidget::insertFromMimeData(const QMimeData *source)
setMultiTextCursor(cursor);
}
void TextEditorWidget::dragLeaveEvent(QDragLeaveEvent *)
{
const QRect rect = cursorRect(d->m_dndCursor);
d->m_dndCursor = QTextCursor();
if (!rect.isNull())
viewport()->update(rect);
}
void TextEditorWidget::dragMoveEvent(QDragMoveEvent *e)
{
const QRect rect = cursorRect(d->m_dndCursor);
d->m_dndCursor = cursorForPosition(e->pos());
if (!rect.isNull())
viewport()->update(rect);
viewport()->update(cursorRect(d->m_dndCursor));
}
void TextEditorWidget::dropEvent(QDropEvent *e)
{
const QRect rect = cursorRect(d->m_dndCursor);
d->m_dndCursor = QTextCursor();
if (!rect.isNull())
viewport()->update(rect);
const QMimeData *mime = e->mimeData();
if (!canInsertFromMimeData(mime))
return;

2
src/plugins/texteditor/texteditor.h
View File

@@ -531,6 +531,8 @@ protected:
QMimeData *createMimeDataFromSelection() const override;
bool canInsertFromMimeData(const QMimeData *source) const override;
void insertFromMimeData(const QMimeData *source) override;
void dragLeaveEvent(QDragLeaveEvent *e) override;
void dragMoveEvent(QDragMoveEvent *e) override;
void dropEvent(QDropEvent *e) override;
virtual QString plainTextFromSelection(const QTextCursor &cursor) const;