ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src: avoid indexing slowdown on macOS by not using unknown progress for progressbar in status bar

Browse Source
This commit is contained in:
Eberhard Graether
2018-07-24 03:36:27 +02:00
parent 0fc670bcd7
commit ac31bb6779
14 changed files with 34 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/view/QtDialogView.cpp
+7 -36
View File
@@ -33,13 +33,7 @@ QtDialogView::~QtDialogView()
bool QtDialogView::dialogsHidden() const
{
QtIndexingDialog* window = dynamic_cast<QtIndexingDialog*>(m_windowStack.getTopWindow());
if (window)
{
return window->isHidden();
}
return false;
return !m_dialogsVisible;
}
void QtDialogView::clearDialogs()
@@ -114,11 +108,6 @@ void QtDialogView::showProgressDialog(const std::wstring& title, const std::wstr
window->updateMessage(QString::fromStdWString(message));
window->updateProgress(progress);
if (m_updateIndexingStatus)
{
MessageIndexingStatus(true, false, progress).dispatch();
}
setUIBlocked(m_dialogsVisible);
}
);
@@ -239,9 +228,11 @@ void QtDialogView::updateIndexingDialog(
std::vector<std::wstring> stati;
for (const FilePath& path : sourcePaths)
{
stati.push_back(L"[" + std::to_wstring(startedFileCount) + L"/" + std::to_wstring(totalFileCount) + L"] Indexing file: " + path.wstr());
stati.push_back(
L"[" + std::to_wstring(startedFileCount) + L"/" + std::to_wstring(totalFileCount) +
L"] Indexing file: " + path.wstr());
}
MessageStatus(stati, false, true, m_dialogsVisible).dispatch();
MessageStatus(stati, false, false, m_dialogsVisible).dispatch();
}
QtIndexingDialog* window = dynamic_cast<QtIndexingDialog*>(m_windowStack.getTopWindow());
@@ -255,21 +246,11 @@ void QtDialogView::updateIndexingDialog(
if (window && window->getType() == QtIndexingDialog::DIALOG_INDEXING)
{
window->updateIndexingProgress(finishedFileCount, totalFileCount, sourcePaths.empty() ? FilePath() : sourcePaths.back());
window->updateIndexingProgress(
finishedFileCount, totalFileCount, sourcePaths.empty() ? FilePath() : sourcePaths.back());
}
m_mainWindow->setWindowsTaskbarProgress(float(finishedFileCount) / totalFileCount);
if (m_updateIndexingStatus)
{
int progress = 0;
if (totalFileCount)
{
progress = finishedFileCount * 100 / totalFileCount;
}
MessageIndexingStatus(true, false, progress).dispatch();
}
setUIBlocked(m_dialogsVisible);
}
);
@@ -279,11 +260,6 @@ DatabasePolicy QtDialogView::finishedIndexingDialog(
size_t indexedFileCount, size_t totalIndexedFileCount, size_t completedFileCount, size_t totalFileCount,
float time, ErrorCountInfo errorInfo, bool interrupted)
{
if (m_updateIndexingStatus)
{
MessageIndexingStatus(false, false, 0).dispatch();
}
DatabasePolicy policy = DATABASE_POLICY_UNKNOWN;
m_resultReady = false;
@@ -441,11 +417,6 @@ void QtDialogView::showUnknownProgress(const std::wstring& title, const std::wst
window->updateTitle(QString::fromStdWString(title));
window->updateMessage(QString::fromStdWString(message));
if (m_updateIndexingStatus)
{
MessageIndexingStatus(true, true, 0).dispatch();
}
setUIBlocked(m_dialogsVisible);
}