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

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

Change-Id: Id9dbc6ac7377816666887096c28fa0008291ddac
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 aface7b1d6
commit 2c3f3970d5
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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