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

Editor: Fix loading color schemes

Browse Source 
When the user switched to another builtin color scheme the full paths
check do not match anymore if the user starts a Qt Creator with a
different install dir.

Change-Id: I4692c85a23a7d524497786db4dd8e1a00bb7a9fe
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2023-09-29 07:42:36 +02:00
parent e607c5530e
commit 01dc62b019
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/fontsettingspage.cpp
View File

@@ -700,7 +700,7 @@ void FontSettingsPageWidget::refreshColorSchemeList()
int selected = 0; int selected = 0;
for (const FilePath &file : std::as_const(schemeList)) { for (const FilePath &file : std::as_const(schemeList)) {
if (m_value.colorSchemeFileName() == file) if (m_value.colorSchemeFileName().fileName() == file.fileName())
selected = colorSchemes.size(); selected = colorSchemes.size();
colorSchemes.append(ColorSchemeEntry(file, true)); colorSchemes.append(ColorSchemeEntry(file, true));
} }
@@ -710,7 +710,7 @@ void FontSettingsPageWidget::refreshColorSchemeList()
const FilePaths files = customStylesPath().dirEntries(FileFilter({"*.xml"}, QDir::Files)); const FilePaths files = customStylesPath().dirEntries(FileFilter({"*.xml"}, QDir::Files));
for (const FilePath &file : files) { for (const FilePath &file : files) {
if (m_value.colorSchemeFileName() == file) if (m_value.colorSchemeFileName().fileName() == file.fileName())
selected = colorSchemes.size(); selected = colorSchemes.size();
colorSchemes.append(ColorSchemeEntry(file, false)); colorSchemes.append(ColorSchemeEntry(file, false));
} }