Add workaround for QProgressDialog bug on macOS

See: QTBUG-65750, QTBUG-70357.
This commit is contained in:
Hennadii Stepanov
2018-12-26 22:19:14 +02:00
parent 035f349371
commit 7c572c488d
4 changed files with 32 additions and 23 deletions

View File

@@ -305,24 +305,19 @@ void WalletView::usedReceivingAddresses()
void WalletView::showProgress(const QString &title, int nProgress)
{
if (nProgress == 0)
{
progressDialog = new QProgressDialog(title, "", 0, 100);
if (nProgress == 0) {
progressDialog = new QProgressDialog(title, tr("Cancel"), 0, 100);
GUIUtil::PolishProgressDialog(progressDialog);
progressDialog->setWindowModality(Qt::ApplicationModal);
progressDialog->setMinimumDuration(0);
progressDialog->setAutoClose(false);
progressDialog->setValue(0);
progressDialog->setCancelButtonText(tr("Cancel"));
}
else if (nProgress == 100)
{
if (progressDialog)
{
} else if (nProgress == 100) {
if (progressDialog) {
progressDialog->close();
progressDialog->deleteLater();
}
}
else if (progressDialog) {
} else if (progressDialog) {
if (progressDialog->wasCanceled()) {
getWalletModel()->wallet().abortRescan();
} else {