From 578de25d9679d372f4f78ac9373d31e2462bc57b Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 18 Jul 2017 17:33:14 +0200 Subject: [PATCH] Core: Overload the search button activation The search button was enabled if there was some text in the search term line edit. If the search term line edit is not used than we need a different mechanism to enable the search button. Change-Id: I5b168447c125199920e82d7990dbdd1a85dff1d7 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/find/findtoolwindow.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp index ffcf3855253..8647b7b2e94 100644 --- a/src/plugins/coreplugin/find/findtoolwindow.cpp +++ b/src/plugins/coreplugin/find/findtoolwindow.cpp @@ -140,7 +140,8 @@ bool FindToolWindow::eventFilter(QObject *obj, QEvent *event) void FindToolWindow::updateButtonStates() { bool filterEnabled = m_currentFilter && m_currentFilter->isEnabled(); - bool enabled = m_ui.searchTerm->isValid() && filterEnabled && m_currentFilter->isValid(); + bool enabled = filterEnabled && (!m_currentFilter->showSearchTermInput() + || m_ui.searchTerm->isValid()) && m_currentFilter->isValid(); m_ui.searchButton->setEnabled(enabled); m_ui.replaceButton->setEnabled(m_currentFilter && m_currentFilter->isReplaceSupported() && enabled); @@ -268,12 +269,12 @@ void FindToolWindow::acceptAndGetParameters(QString *term, IFindFilter **filter) Find::updateFindCompletion(m_ui.searchTerm->text()); int index = m_ui.filterList->currentIndex(); QString searchTerm = m_ui.searchTerm->text(); + if (filter && index >= 0) + *filter = m_filters.at(index); if (term) *term = searchTerm; - if (searchTerm.isEmpty() || index < 0) - return; - if (filter) - *filter = m_filters.at(index); + if (searchTerm.isEmpty() && *filter && !(*filter)->isValid()) + *filter = 0; } void FindToolWindow::search()