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

Editor: correct background color for matching parentheses

Browse Source 
Task-number: QTCREATORBUG-512

Change-Id: I09a52bcf98e0f2c0bc2e68df4821f94714873580
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
David Schulz
2012-09-13 15:23:45 +02:00
committed by David Schulz
parent deed11f392
commit 71c2f2810e
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/texteditor/basetexteditor.cpp
View File

@@ -255,7 +255,7 @@ BaseTextEditorWidget::BaseTextEditorWidget(QWidget *parent)
// parentheses matcher
d->m_formatRange = true;
d->m_matchFormat.setForeground(Qt::red);
d->m_rangeFormat.setBackground(QColor(0xb4, 0xee, 0xb4));
d->m_matchFormat.setBackground(QColor(0xb4, 0xee, 0xb4));
d->m_mismatchFormat.setBackground(Qt::magenta);
d->m_parenthesesMatchingTimer = new QTimer(this);
d->m_parenthesesMatchingTimer->setSingleShot(true);
@@ -5029,15 +5029,11 @@ void BaseTextEditorWidget::_q_matchParentheses()
if (backwardMatchType == TextBlockUserData::Mismatch) {
sel.cursor = backwardMatch;
sel.format = d->m_mismatchFormat;
extraSelections.append(sel);
} else {
if (d->m_displaySettings.m_animateMatchingParentheses) {
if (d->m_displaySettings.m_animateMatchingParentheses)
animatePosition = backwardMatch.selectionStart();
} else if (d->m_formatRange) {
sel.cursor = backwardMatch;
sel.format = d->m_rangeFormat;
extraSelections.append(sel);
}
sel.cursor = backwardMatch;
sel.format = d->m_matchFormat;
@@ -5048,8 +5044,8 @@ void BaseTextEditorWidget::_q_matchParentheses()
sel.cursor.setPosition(backwardMatch.selectionEnd());
sel.cursor.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
extraSelections.append(sel);
}
extraSelections.append(sel);
}
if (forwardMatch.hasSelection()) {
@@ -5057,15 +5053,11 @@ void BaseTextEditorWidget::_q_matchParentheses()
if (forwardMatchType == TextBlockUserData::Mismatch) {
sel.cursor = forwardMatch;
sel.format = d->m_mismatchFormat;
extraSelections.append(sel);
} else {
if (d->m_displaySettings.m_animateMatchingParentheses) {
if (d->m_displaySettings.m_animateMatchingParentheses)
animatePosition = forwardMatch.selectionEnd()-1;
} else if (d->m_formatRange) {
sel.cursor = forwardMatch;
sel.format = d->m_rangeFormat;
extraSelections.append(sel);
}
sel.cursor = forwardMatch;
sel.format = d->m_matchFormat;
@@ -5076,8 +5068,8 @@ void BaseTextEditorWidget::_q_matchParentheses()
sel.cursor.setPosition(forwardMatch.selectionEnd());
sel.cursor.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
extraSelections.append(sel);
}
extraSelections.append(sel);
}
@@ -5098,7 +5090,7 @@ void BaseTextEditorWidget::_q_matchParentheses()
d->m_animator->setPosition(animatePosition);
QPalette pal;
pal.setBrush(QPalette::Text, d->m_matchFormat.foreground());
pal.setBrush(QPalette::Base, d->m_rangeFormat.background());
pal.setBrush(QPalette::Base, d->m_matchFormat.background());
d->m_animator->setData(font(), pal, characterAt(d->m_animator->position()));
connect(d->m_animator, SIGNAL(updateRequest(int,QPointF,QRectF)),
this, SLOT(_q_animateUpdate(int,QPointF,QRectF)));
@@ -5601,9 +5593,7 @@ void BaseTextEditorWidget::setFontSettings(const TextEditor::FontSettings &fs)
d->m_searchResultFormat.setBackground(searchResultFormat.background());
// Matching braces
d->m_matchFormat.setForeground(parenthesesFormat.foreground());
d->m_rangeFormat.setBackground(parenthesesFormat.background());
d->m_matchFormat = parenthesesFormat;
// snippests
d->m_occurrencesFormat = fs.toTextCharFormat(C_OCCURRENCES);