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

Fix search result font for symbol searches

Browse Source 
SearchResultItem defaults to the standard application font,
we need to tell it to use the text editor font explicitly,
like the specialized addResult method did that was removed.

Amends d3deefc3a4

Fixes: QTCREATORBUG-25396
Change-Id: Id8d41d93c96fbfd6d993568a37d42509da452665
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Eike Ziller
2021-03-02 09:10:08 +01:00
parent 385aecc692
commit 261967a5f4
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/cppeditor/cppeditorwidget.cpp
View File

@@ -421,6 +421,7 @@ static void addSearchResults(CppTools::Usages usages, SearchResult &search, cons
item.setFilePath(FilePath::fromString(usage.path)); item.setFilePath(FilePath::fromString(usage.path));
item.setLineText(lineContent); item.setLineText(lineContent);
item.setMainRange(range); item.setMainRange(range);
item.setUseTextEditorFont(true);
search.addResult(item); search.addResult(item);
} }
} }

2
src/plugins/cpptools/cppfindreferences.cpp
View File

@@ -636,6 +636,7 @@ static void displayResults(SearchResult *search, QFutureWatcher<CPlusPlus::Usage
item.setLineText(result.lineText); item.setLineText(result.lineText);
item.setUserData(int(result.type)); item.setUserData(int(result.type));
item.setStyle(colorStyleForUsageType(result.type)); item.setStyle(colorStyleForUsageType(result.type));
item.setUseTextEditorFont(true);
search->addResult(item); search->addResult(item);
if (parameters.prettySymbolName.isEmpty()) if (parameters.prettySymbolName.isEmpty())
@@ -831,6 +832,7 @@ void CppFindReferences::findMacroUses(const CPlusPlus::Macro &macro, const QStri
item.setFilePath(Utils::FilePath::fromString(macro.fileName())); item.setFilePath(Utils::FilePath::fromString(macro.fileName()));
item.setLineText(line); item.setLineText(line);
item.setMainRange(macro.line(), column, macro.nameToQString().length()); item.setMainRange(macro.line(), column, macro.nameToQString().length());
item.setUseTextEditorFont(true);
search->addResult(item); search->addResult(item);
} }

1
src/plugins/qmljseditor/qmljsfindreferences.cpp
View File

@@ -1012,6 +1012,7 @@ void FindReferences::displayResults(int first, int last)
item.setFilePath(Utils::FilePath::fromString(result.path)); item.setFilePath(Utils::FilePath::fromString(result.path));
item.setLineText(result.lineText); item.setLineText(result.lineText);
item.setMainRange(result.line, result.col, result.len); item.setMainRange(result.line, result.col, result.len);
item.setUseTextEditorFont(true);
m_currentSearch->addResult(item); m_currentSearch->addResult(item);
} }
} }