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

TextEditor: Default to Text style on style absence (take 2)

Browse Source 
The current default is black foreground, which is invisible on dark
color schemes.

Change-Id: Iaa2520422ea6a6b355c89d71d204a7620aa98fcd
(cherry picked from commit 2c3f3970d5)
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-10-26 12:27:34 +02:00
committed by Orgad Shaneh
parent ac931e19d5
commit edc77e339f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/texteditor/fontsettings.cpp
View File

@@ -363,8 +363,15 @@ bool FontSettings::loadColorScheme(const QString &fileName,
if (!m_scheme.contains(id)) { if (!m_scheme.contains(id)) {
Format format; Format format;
const Format &descFormat = desc.format(); const Format &descFormat = desc.format();
format.setForeground(descFormat.foreground()); if (descFormat == format && m_scheme.contains(C_TEXT)) {
format.setBackground(descFormat.background()); // Default format -> Text
const Format textFormat = m_scheme.formatFor(C_TEXT);
format.setForeground(textFormat.foreground());
format.setBackground(textFormat.background());
} else {
format.setForeground(descFormat.foreground());
format.setBackground(descFormat.background());
}
format.setBold(descFormat.bold()); format.setBold(descFormat.bold());
format.setItalic(descFormat.italic()); format.setItalic(descFormat.italic());
format.setUnderlineColor(descFormat.underlineColor()); format.setUnderlineColor(descFormat.underlineColor());