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

9
src/plugins/diffeditor/diffeditorwidget.h
View File

@@ -38,6 +38,7 @@
namespace TextEditor {
class BaseTextEditorWidget;
class SnippetEditorWidget;
class FontSettings;
}
QT_BEGIN_NAMESPACE
@@ -101,6 +102,7 @@ protected:
TextEditor::SnippetEditorWidget *rightEditor() const;
private slots:
void setFontSettings(const TextEditor::FontSettings &fontSettings);
void leftVSliderChanged();
void rightVSliderChanged();
void leftHSliderChanged();
@@ -146,6 +148,13 @@ private:
bool m_syncScrollBars;
bool m_foldingBlocker;
QTextCharFormat m_fileLineFormat;
QTextCharFormat m_chunkLineFormat;
QTextCharFormat m_leftLineFormat;
QTextCharFormat m_leftCharFormat;
QTextCharFormat m_rightLineFormat;
QTextCharFormat m_rightCharFormat;
};
} // namespace DiffEditor