From f5bbdf24e178a7b97cceed27718da96a85629834 Mon Sep 17 00:00:00 2001 From: Juraj Oravec Date: Sat, 10 Sep 2022 11:10:47 +0200 Subject: [PATCH] Searchbar: Fix show suggestions handling Do not contact search engine when suggestions are disabled. BUG: 439268 Signed-off-by: Juraj Oravec --- src/lib/navigation/websearchbar.cpp | 15 +++++++++++++-- src/lib/navigation/websearchbar.h | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/lib/navigation/websearchbar.cpp b/src/lib/navigation/websearchbar.cpp index 0ebb24739..13aaf80e0 100644 --- a/src/lib/navigation/websearchbar.cpp +++ b/src/lib/navigation/websearchbar.cpp @@ -156,6 +156,7 @@ void WebSearchBar::enableSearchSuggestions(bool enable) qzSettings->showWSBSearchSuggestions = enable; m_completerModel->setStringList(QStringList()); + updateOpenSearchEngine(); } void WebSearchBar::setupEngines() @@ -200,8 +201,7 @@ void WebSearchBar::searchChanged(const ButtonWithMenu::Item &item) m_activeEngine = item.userData.value(); - m_openSearchEngine->setSuggestionsUrl(m_activeEngine.suggestionsUrl); - m_openSearchEngine->setSuggestionsParameters(m_activeEngine.suggestionsParameters); + updateOpenSearchEngine(); m_searchManager->setActiveEngine(m_activeEngine); @@ -334,3 +334,14 @@ void WebSearchBar::keyPressEvent(QKeyEvent* event) LineEdit::keyPressEvent(event); } + +void WebSearchBar::updateOpenSearchEngine() +{ + if (qzSettings->showWSBSearchSuggestions) { + m_openSearchEngine->setSuggestionsUrl(m_activeEngine.suggestionsUrl); + m_openSearchEngine->setSuggestionsParameters(m_activeEngine.suggestionsParameters); + } + else { + m_openSearchEngine->setSuggestionsUrl(QL1S("")); + } +} diff --git a/src/lib/navigation/websearchbar.h b/src/lib/navigation/websearchbar.h index 0e9dacdd0..9705b37c1 100644 --- a/src/lib/navigation/websearchbar.h +++ b/src/lib/navigation/websearchbar.h @@ -75,6 +75,8 @@ private: void contextMenuEvent(QContextMenuEvent* event) override; + void updateOpenSearchEngine(); + QCompleter* m_completer; QStringListModel* m_completerModel;