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

Take diff colors from color scheme

Browse Source 
Change-Id: I706612a8f89917cb57b7d1e9ecebd86b3f4bcc8d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
jkobus
2013-06-05 15:25:42 +02:00
committed by hjk
parent 93ea763a8d
commit abe3951d67
13 changed files with 174 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/texteditor/fontsettingspage.cpp
View File

@@ -298,6 +298,13 @@ QColor FormatDescription::background() const
return QColor(255, 100, 100);
} else if (m_id == C_DISABLED_CODE) {
return QColor(239, 239, 239);
} else if (m_id == C_DIFF_FILE_LINE
|| m_id == C_DIFF_CONTEXT_LINE
|| m_id == C_DIFF_SOURCE_LINE
|| m_id == C_DIFF_SOURCE_CHAR
|| m_id == C_DIFF_DEST_LINE
|| m_id == C_DIFF_DEST_CHAR) {
return m_format.background();
}
return QColor(); // invalid color
}