Browse Source

[Qt, OSX] move QProgressBarMac to guiutil.h

tags/v0.15.1
Jonas Schnelli 5 years ago
parent
commit
0ceab00d16
2 changed files with 18 additions and 19 deletions
  1. 1
    19
      src/qt/bitcoingui.cpp
  2. 17
    0
      src/qt/guiutil.h

+ 1
- 19
src/qt/bitcoingui.cpp View File

@@ -58,20 +58,6 @@
#include <QUrlQuery>
#endif

#ifdef Q_OS_MAC
#include <QEvent>

// workaround for Qt OSX Bug:
// https://bugreports.qt-project.org/browse/QTBUG-15631
// QProgressBar uses around 10% CPU even when app is in background
class QProgressBarMac : public QProgressBar
{
bool event(QEvent *e) {
return (e->type() != QEvent::StyleAnimationUpdate) ? QProgressBar::event(e) : false;
}
};
#endif

const QString BitcoinGUI::DEFAULT_WALLET = "~Default";

BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) :
@@ -204,11 +190,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) :
// Progress bar and label for blocks download
progressBarLabel = new QLabel();
progressBarLabel->setVisible(false);
#ifdef Q_OS_MAC
progressBar = new QProgressBarMac();
#else
progressBar = new QProgressBar();
#endif
progressBar = new GUIUtil::ProgressBar();
progressBar->setAlignment(Qt::AlignCenter);
progressBar->setVisible(false);


+ 17
- 0
src/qt/guiutil.h View File

@@ -7,9 +7,11 @@

#include "amount.h"

#include <QEvent>
#include <QHeaderView>
#include <QMessageBox>
#include <QObject>
#include <QProgressBar>
#include <QString>
#include <QTableView>

@@ -186,6 +188,21 @@ namespace GUIUtil

/* Format a CNodeCombinedStats.dPingTime into a user-readable string or display N/A, if 0*/
QString formatPingTime(double dPingTime);
#ifdef Q_OS_MAC
// workaround for Qt OSX Bug:
// https://bugreports.qt-project.org/browse/QTBUG-15631
// QProgressBar uses around 10% CPU even when app is in background
class ProgressBar : public QProgressBar
{
bool event(QEvent *e) {
return (e->type() != QEvent::StyleAnimationUpdate) ? QProgressBar::event(e) : false;
}
};
#else
typedef QProgressBar ProgressBar;
#endif
} // namespace GUIUtil

#endif // BITCOIN_QT_GUIUTIL_H

Loading…
Cancel
Save