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

Reorder coloring inside diff editor

Browse Source 
Display properly separators in differences

Change-Id: Ia7aa1f1ee96a07e0ed96773e8363e68f3d3a5638
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
This commit is contained in:
jkobus
2014-03-12 11:53:51 +01:00
committed by Jarek Kobus
parent 541b5141f2
commit f4db27a65c
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
View File

@@ -1120,27 +1120,19 @@ void SideBySideDiffEditorWidget::colorDiff(const QList<FileData> &fileDataList)
QTextCursor leftCursor = m_leftEditor->textCursor();
QTextCursor rightCursor = m_rightEditor->textCursor();
QList<QTextEdit::ExtraSelection> leftSelections
= colorPositions(m_leftLineFormat, leftCursor, leftLinePos);
leftSelections
+= colorPositions(m_chunkLineFormat, leftCursor, leftChunkPos);
leftSelections
+= colorPositions(m_fileLineFormat, leftCursor, leftFilePos);
leftSelections
+= colorPositions(spanLineFormat, leftCursor, leftSkippedPos);
leftSelections
+= colorPositions(m_leftCharFormat, leftCursor, leftCharPos);
QList<QTextEdit::ExtraSelection> leftSelections;
leftSelections += colorPositions(m_leftLineFormat, leftCursor, leftLinePos);
leftSelections += colorPositions(m_leftCharFormat, leftCursor, leftCharPos);
leftSelections += colorPositions(spanLineFormat, leftCursor, leftSkippedPos);
leftSelections += colorPositions(m_chunkLineFormat, leftCursor, leftChunkPos);
leftSelections += colorPositions(m_fileLineFormat, leftCursor, leftFilePos);
QList<QTextEdit::ExtraSelection> rightSelections
= colorPositions(m_rightLineFormat, rightCursor, rightLinePos);
rightSelections
+= colorPositions(m_chunkLineFormat, rightCursor, rightChunkPos);
rightSelections
+= colorPositions(m_fileLineFormat, rightCursor, rightFilePos);
rightSelections
+= colorPositions(spanLineFormat, rightCursor, rightSkippedPos);
rightSelections
+= colorPositions(m_rightCharFormat, rightCursor, rightCharPos);
QList<QTextEdit::ExtraSelection> rightSelections;
rightSelections += colorPositions(m_rightLineFormat, rightCursor, rightLinePos);
rightSelections += colorPositions(m_rightCharFormat, rightCursor, rightCharPos);
rightSelections += colorPositions(spanLineFormat, rightCursor, rightSkippedPos);
rightSelections += colorPositions(m_chunkLineFormat, rightCursor, rightChunkPos);
rightSelections += colorPositions(m_fileLineFormat, rightCursor, rightFilePos);
m_leftEditor->setExtraSelections(BaseTextEditorWidget::OtherSelection, leftSelections);
m_rightEditor->setExtraSelections(BaseTextEditorWidget::OtherSelection, rightSelections);