diff options
| author | David Schulz <david.schulz@qt.io> | 2016-12-05 12:46:48 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2016-12-05 12:26:06 +0000 |
| commit | c8215d4b6e7cb932af9f7b201f83d254f965423c (patch) | |
| tree | 5d371e4f4c1c75b774fab82f915cad364acb4f7a | |
| parent | ebf8c1eaf06a4fdefbb5787d65598808ac4a65ab (diff) | |
| download | qt-creator-c8215d4b6e7cb932af9f7b201f83d254f965423c.tar.gz | |
Editor: Fix search result backgound for declarations
Don't add a background to a format without a background
if a mixin is applied.
Task-number: QTCREATORBUG-17314
Change-Id: Ie76fe7f69e98e9cfdfa290c40f0774dbe6f86cea
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| -rw-r--r-- | src/plugins/texteditor/fontsettings.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/plugins/texteditor/fontsettings.cpp b/src/plugins/texteditor/fontsettings.cpp index e0017a4e89..c0abf4c24b 100644 --- a/src/plugins/texteditor/fontsettings.cpp +++ b/src/plugins/texteditor/fontsettings.cpp @@ -233,10 +233,6 @@ void FontSettings::addMixinStyle(QTextCharFormat &textCharFormat, textCharFormat.setBackground(mixBrush(textCharFormat.background(), format.relativeBackgroundSaturation(), format.relativeBackgroundLightness())); - } else { - textCharFormat.setBackground(mixBrush(m_scheme.formatFor(C_TEXT).background(), - format.relativeBackgroundSaturation(), - format.relativeBackgroundLightness())); } if (!textCharFormat.fontItalic()) |