LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #15040: qt: Add workaround for QProgressDialog bug on macOS

Browse source 
7c572c488 Add workaround for QProgressDialog bug on macOS (Hennadii Stepanov)

Pull request description:

  Fix #15016.

  Refs:
  - [QTBUG-65750: QProgressDialog too small width at larger font size on Mac](https://bugreports.qt.io/browse/QTBUG-65750)
  - [QTBUG-70357: QProgressDialog is too narrow to fit the text of its label](https://bugreports.qt.io/browse/QTBUG-70357)

  With this PR:
  ![screenshot from 2018-12-26 22-01-30](https://user-images.githubusercontent.com/32963518/50456571-1aa35b80-095e-11e9-8442-c285555f2bee.png)

Tree-SHA512: dde668dfa7d2144973c0e868aea7fdb7d90f78584836d024ffefb8df4a709d6842fa3601954759b4462856a80e81df15b861ea39506599230a16928b621d9f8f
This commit is contained in:
Jonas Schnelli 2019-01-17 11:16:54 -10:00
commit cd42553b11
No known key found for this signature in database
GPG key ID: 1EB776BB03C7922D
4 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/qt/bitcoingui.cpp
View file

@ -1245,25 +1245,21 @@ void BitcoinGUI::detectShutdown()
void BitcoinGUI::showProgress(const QString &title, int nProgress) void BitcoinGUI::showProgress(const QString &title, int nProgress)
{ {
if (nProgress == 0) if (nProgress == 0) {
{ progressDialog = new QProgressDialog(title, QString(), 0, 100);
progressDialog = new QProgressDialog(title, "", 0, 100); GUIUtil::PolishProgressDialog(progressDialog);
progressDialog->setWindowModality(Qt::ApplicationModal); progressDialog->setWindowModality(Qt::ApplicationModal);
progressDialog->setMinimumDuration(0); progressDialog->setMinimumDuration(0);
progressDialog->setCancelButton(nullptr);
progressDialog->setAutoClose(false); progressDialog->setAutoClose(false);
progressDialog->setValue(0); progressDialog->setValue(0);
} } else if (nProgress == 100) {
else if (nProgress == 100) if (progressDialog) {
{
if (progressDialog)
{
progressDialog->close(); progressDialog->close();
progressDialog->deleteLater(); progressDialog->deleteLater();
} }
} } else if (progressDialog) {
else if (progressDialog)
progressDialog->setValue(nProgress); progressDialog->setValue(nProgress);
}
} }
void BitcoinGUI::setTrayIconVisible(bool fHideTrayIcon) void BitcoinGUI::setTrayIconVisible(bool fHideTrayIcon)

16
src/qt/guiutil.cpp
View file

@ -48,13 +48,15 @@
#include <QFileDialog> #include <QFileDialog>
#include <QFont> #include <QFont>
#include <QFontDatabase> #include <QFontDatabase>
#include <QFontMetrics>
#include <QKeyEvent> #include <QKeyEvent>
#include <QLineEdit> #include <QLineEdit>
#include <QMouseEvent>
#include <QProgressDialog>
#include <QSettings> #include <QSettings>
#include <QTextDocument> // for Qt::mightBeRichText #include <QTextDocument> // for Qt::mightBeRichText
#include <QThread> #include <QThread>
#include <QUrlQuery> #include <QUrlQuery>
#include <QMouseEvent>
#if defined(Q_OS_MAC) #if defined(Q_OS_MAC)
#pragma GCC diagnostic push #pragma GCC diagnostic push
@ -933,4 +935,16 @@ bool ItemDelegate::eventFilter(QObject *object, QEvent *event)
return QItemDelegate::eventFilter(object, event); return QItemDelegate::eventFilter(object, event);
} }
void PolishProgressDialog(QProgressDialog* dialog)
{
#ifdef Q_OS_MAC
// Workaround for macOS-only Qt bug; see: QTBUG-65750, QTBUG-70357.
const int margin = dialog->fontMetrics().width("X");
dialog->resize(dialog->width() + 2 * margin, dialog->height());
dialog->show();
#else
Q_UNUSED(dialog);
#endif
}
} // namespace GUIUtil } // namespace GUIUtil

4
src/qt/guiutil.h
View file

@ -31,6 +31,7 @@ class QAbstractItemView;
class QDateTime; class QDateTime;
class QFont; class QFont;
class QLineEdit; class QLineEdit;
class QProgressDialog;
class QUrl; class QUrl;
class QWidget; class QWidget;
QT_END_NAMESPACE QT_END_NAMESPACE
@ -248,6 +249,9 @@ namespace GUIUtil
private: private:
bool eventFilter(QObject *object, QEvent *event); bool eventFilter(QObject *object, QEvent *event);
}; };
// Fix known bugs in QProgressDialog class.
void PolishProgressDialog(QProgressDialog* dialog);
} // namespace GUIUtil } // namespace GUIUtil
#endif // BITCOIN_QT_GUIUTIL_H #endif // BITCOIN_QT_GUIUTIL_H

17
src/qt/walletview.cpp
View file

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