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

TextEditor: add action to paste without autoFormat

Browse Source 
Fixes: QTCREATORBUG-20887
Change-Id: Iedc6b584c9c1cc48804025653d0749e054a406f8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-11-18 08:30:05 +01:00
parent dc8edcefba
commit c5c3214cfb
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -764,6 +764,7 @@ public:
bool m_animateAutoComplete = true;
bool m_highlightAutoComplete = true;
bool m_skipAutoCompletedText = true;
bool m_skipFormatOnPaste = false;
bool m_removeAutoCompletedText = true;
bool m_keepAutoCompletionHighlight = false;
QList<QTextCursor> m_autoCompleteHighlightPos;
@@ -7613,6 +7614,13 @@ void TextEditorWidget::circularPaste()
}
}
void TextEditorWidget::pasteWithoutFormat()
{
d->m_skipFormatOnPaste = true;
paste();
d->m_skipFormatOnPaste = false;
}
void TextEditorWidget::switchUtf8bom()
{
textDocument()->switchUtf8Bom();
@@ -7790,9 +7798,10 @@ void TextEditorWidget::insertFromMimeData(const QMimeData *source)
int reindentBlockEnd = cursor.blockNumber() - (hasFinalNewline?1:0);
if (reindentBlockStart < reindentBlockEnd
|| (reindentBlockStart == reindentBlockEnd
&& (!insertAtBeginningOfLine || hasFinalNewline))) {
if (!d->m_skipFormatOnPaste
&& (reindentBlockStart < reindentBlockEnd
|| (reindentBlockStart == reindentBlockEnd
&& (!insertAtBeginningOfLine || hasFinalNewline)))) {
if (insertAtBeginningOfLine && !hasFinalNewline) {
QTextCursor unnecessaryWhitespace = cursor;
unnecessaryWhitespace.setPosition(cursorPosition);