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

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

@@ -3517,9 +3517,13 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e)
bool selectThis = (hasSelection
&& nextBlock.position() >= selectionStart
&& nextBlock.position() < selectionEnd);
painter.save();
if (selectThis) {
painter.save();
painter.setBrush(palette().highlight());
} else {
QColor rc = replacementPenColor(block.blockNumber());
if (rc.isValid())
painter.setPen(rc);
}
QTextLayout *layout = block.layout();
@@ -3566,8 +3570,7 @@ void BaseTextEditorWidget::paintEvent(QPaintEvent *e)
if (selectThis)
painter.setPen(palette().highlightedText().color());
painter.drawText(collapseRect, Qt::AlignCenter, replacement);
if (selectThis)
painter.restore();
painter.restore();
}
}
@@ -6206,6 +6209,12 @@ bool BaseTextEditorWidget::replacementVisible(int blockNumber) const
return true;
}
QColor BaseTextEditorWidget::replacementPenColor(int blockNumber) const
{
Q_UNUSED(blockNumber)
return QColor();
}
void BaseTextEditorWidget::appendMenuActionsFromContext(QMenu *menu, const Core::Id menuContextId)
{
Core::ActionContainer *mcontext = Core::ActionManager::actionContainer(menuContextId);