p90463782
/
ukui-search
forked from openkylin/ukui-search
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!12 同步下游提交 

Merge pull request !12 from 白俊杰/0829openkylin
This commit is contained in:
zhaikangning 2022-08-31 07:25:10 +00:00 committed by Gitee
parent 9f53cafb8d c2a5051b5d
commit 4b675befab
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/mainwindow.cpp
View File

@ -301,10 +301,12 @@ void MainWindow::searchKeywordSlot(const QString &keyword)
//NEW_TODO //NEW_TODO
if(keyword == "") { if(keyword == "") {
// m_stackedWidget->setPage(int(StackedPage::HomePage)); // m_stackedWidget->setPage(int(StackedPage::HomePage));
m_askTimer->stop(); QTimer::singleShot(10, this, [ = ]() {
Q_EMIT m_searchResultPage->stopSearch(); m_askTimer->stop();
m_searchResultPage->hide(); // Q_EMIT m_searchResultPage->stopSearch();
this->resizeHeight(68); m_searchResultPage->hide();
this->resizeHeight(68);
});
} else { } else {
// m_stackedWidget->setPage(int(StackedPage::SearchPage)); // m_stackedWidget->setPage(int(StackedPage::SearchPage));

1
frontend/model/search-result-manager.cpp
View File

@ -67,6 +67,7 @@ ReceiveResultThread::ReceiveResultThread(DataQueue<SearchPluginIface::ResultInfo
void ReceiveResultThread::stop() void ReceiveResultThread::stop()
{ {
this->requestInterruption(); this->requestInterruption();
this->wait();
this->quit(); this->quit();
} }