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

Adapt find tool bar input fields to searched widget's font

Browse Source 
Adapt the font of the search and replace input fields to the font of the
widget that is searched. This makes it use the text editor font when
searching in the text editor but keeps the "application font" when
searching in other widgets.

Change-Id: I8bd3b5dd3d14ab0e774f7272be236c35abd12de0
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2023-07-28 14:49:05 +02:00
parent c7710acadd
commit 9dc9a43f40
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/find/currentdocumentfind.cpp
View File

@@ -240,6 +240,11 @@ bool CurrentDocumentFind::eventFilter(QObject *obj, QEvent *event)
return QObject::eventFilter(obj, event); return QObject::eventFilter(obj, event);
} }
QWidget *CurrentDocumentFind::currentWidget() const
{
return m_currentWidget.get();
}
void CurrentDocumentFind::aggregationChanged() void CurrentDocumentFind::aggregationChanged()
{ {
if (m_currentWidget) { if (m_currentWidget) {

2
src/plugins/coreplugin/find/currentdocumentfind.h
View File

@@ -45,6 +45,8 @@ public:
bool eventFilter(QObject *obj, QEvent *event) override; bool eventFilter(QObject *obj, QEvent *event) override;
QWidget *currentWidget() const;
signals: signals:
void changed(); void changed();
void candidateChanged(); void candidateChanged();

6
src/plugins/coreplugin/find/findtoolbar.cpp
View File

@@ -490,6 +490,12 @@ void FindToolBar::adaptToCandidate()
updateActions(); updateActions();
if (findToolBarPlaceHolder() == FindToolBarPlaceHolder::getCurrent()) { if (findToolBarPlaceHolder() == FindToolBarPlaceHolder::getCurrent()) {
m_currentDocumentFind->acceptCandidate(); m_currentDocumentFind->acceptCandidate();
if (QWidget *widget = m_currentDocumentFind->currentWidget()) {
QFont f = font();
f.setFamily(widget->font().family());
m_findEdit->setFont(f);
m_replaceEdit->setFont(f);
}
if (isVisible() && m_currentDocumentFind->isEnabled()) if (isVisible() && m_currentDocumentFind->isEnabled())
m_currentDocumentFind->highlightAll(getFindText(), effectiveFindFlags()); m_currentDocumentFind->highlightAll(getFindText(), effectiveFindFlags());
} }