diff options
| author | Jonas Schnelli <jonas.schnelli@include7.ch> | 2014-11-18 09:55:39 +0100 |
|---|---|---|
| committer | Jonas Schnelli <jonas.schnelli@include7.ch> | 2014-11-19 14:08:56 +0100 |
| commit | 0ceab00d16a1d23da06a748889db25662b16bfb3 (patch) | |
| tree | c1f994cb150c5bdb7e7a8d9a45900c17dc1560ee /src | |
| parent | 6093aa1bb03b03331cc2f48d8f6b749f8817c016 (diff) | |
| download | bitcoin-0ceab00d16a1d23da06a748889db25662b16bfb3.tar.xz | |
[Qt, OSX] move QProgressBarMac to guiutil.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 20 | ||||
| -rw-r--r-- | src/qt/guiutil.h | 17 |
2 files changed, 18 insertions, 19 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 06e53ea1e6..6a457d361f 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -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); diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index 5666744bd3..a6ecfbcc82 100644 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -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 |