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

VCS: Make dark color schemes work with annotation highlighter

Browse Source 
Task-number: QTCREATORBUG-6257

Change-Id: Ied01cf6773b5114100afccbac33f359cc72c0889
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2012-03-06 14:32:32 +01:00
parent 5e36568628
commit 4b366303e6
28 changed files with 81 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/vcsbase/baseannotationhighlighter.cpp
View File

@@ -62,15 +62,18 @@ class BaseAnnotationHighlighterPrivate
{
public:
ChangeNumberFormatMap m_changeNumberMap;
QColor m_background;
};
} // namespace Internal
BaseAnnotationHighlighter::BaseAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document) :
const QColor &bg,
QTextDocument *document) :
TextEditor::SyntaxHighlighter(document),
d(new Internal::BaseAnnotationHighlighterPrivate)
{
d->m_background = bg;
setChangeNumbers(changeNumbers);
}
@@ -81,6 +84,7 @@ BaseAnnotationHighlighter::~BaseAnnotationHighlighter()
void BaseAnnotationHighlighter::setChangeNumbers(const ChangeNumbers &changeNumbers)
{
QColor bg = d->m_background;
d->m_changeNumberMap.clear();
if (!changeNumbers.isEmpty()) {
// Assign a color gradient to annotation change numbers. Give
@@ -89,10 +93,16 @@ void BaseAnnotationHighlighter::setChangeNumbers(const ChangeNumbers &changeNumb
const int step = qRound(ceil(pow(double(changeNumbers.count()), oneThird)));
QList<QColor> colors;
const int factor = 255 / step;
for (int i=0; i<step; ++i)
for (int j=0; j<step; ++j)
for (int k=0; k<step; ++k)
colors.append(QColor(i*factor, j*factor, k*factor));
int half = factor / 2;
for (int i=0; i<=step; ++i)
for (int j=0; j<=step; ++j)
for (int k=0; k<=step; ++k) {
QColor c(i*factor, j*factor, k*factor);
if ((bg.red() - half > c.red() ||bg.red() + half <= c.red())
&& (bg.green() - half > c.green() || bg.green() + half <= c.green())
&& (bg.blue() - half > c.blue() || bg.blue() + half <= c.blue()))
colors.prepend(c);
}
int m = 0;
const int cstep = colors.count() / changeNumbers.count();
@@ -116,4 +126,10 @@ void BaseAnnotationHighlighter::highlightBlock(const QString &text)
setFormat(0, text.length(), it.value());
}
void BaseAnnotationHighlighter::setBackgroundColor(const QColor &color)
{
d->m_background = color;
setChangeNumbers(d->m_changeNumberMap.keys().toSet());
}
} // namespace VcsBase