From 7f770dd382e43c68883c59a573613c8cdf11bbfd Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Sun, 23 Oct 2022 10:29:16 +0300 Subject: [PATCH] [desktop] Fixed search indicator in Viewport mode. Signed-off-by: Viktor Govako --- qt/search_panel.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp index ef71e95a64..c037a70523 100644 --- a/qt/search_panel.cpp +++ b/qt/search_panel.cpp @@ -233,8 +233,6 @@ void SearchPanel::OnSearchTextChanged(QString const & str) } bool const isCategory = m_isCategory->isChecked(); - - bool started = false; auto const timestamp = ++m_timestamp; using namespace search; @@ -250,7 +248,8 @@ void SearchPanel::OnSearchTextChanged(QString const & str) } }; - started = m_pDrawWidget->GetFramework().GetSearchAPI().SearchEverywhere(std::move(params)); + if (m_pDrawWidget->GetFramework().GetSearchAPI().SearchEverywhere(std::move(params))) + StartBusyIndicator(); } else if (m_mode == Mode::Viewport) { @@ -258,7 +257,10 @@ void SearchPanel::OnSearchTextChanged(QString const & str) { normalized, GetCurrentInputLocale(), {} /* timeout */, isCategory, // m_onStarted - {}, + [this]() + { + StartBusyIndicator(); + }, // m_onCompleted [this](search::Results results) { @@ -273,11 +275,8 @@ void SearchPanel::OnSearchTextChanged(QString const & str) } }; - started = m_pDrawWidget->GetFramework().GetSearchAPI().SearchInViewport(std::move(params)); + m_pDrawWidget->GetFramework().GetSearchAPI().SearchInViewport(std::move(params)); } - - if (started) - StartBusyIndicator(); } void SearchPanel::OnSearchModeChanged(int mode)