[Qt] Show ModalOverlay by pressing the progress bar, disabled show() in sync mode

jonasschnelli · jonasschnelli · commit 89a3723bdc5d · 2016-12-05T13:58:00.000+01:00
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -46,7 +46,6 @@
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QMimeData>
-#include <QProgressBar>
 #include <QProgressDialog>
 #include <QSettings>
 #include <QShortcut>
@@ -251,6 +250,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
     if(enableWallet) {
         connect(walletFrame, SIGNAL(requestedSyncWarningInfo()), this, SLOT(showModalOverlay()));
         connect(labelBlocksIcon, SIGNAL(clicked(QPoint)), this, SLOT(showModalOverlay()));
+        connect(progressBar, SIGNAL(clicked(QPoint)), this, SLOT(showModalOverlay()));
     }
 #endif
 }
@@ -1138,8 +1138,8 @@ void BitcoinGUI::setTrayIconVisible(bool fHideTrayIcon)
 
 void BitcoinGUI::showModalOverlay()
 {
-    if (modalOverlay)
-        modalOverlay->showHide(false, true);
+    if (modalOverlay && (progressBar->isVisible() || modalOverlay->isLayerVisible()))
+        modalOverlay->toggleVisibility();
 }
 
 static bool ThreadSafeMessageBox(BitcoinGUI *gui, const std::string& message, const std::string& caption, unsigned int style)
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -988,7 +988,12 @@ QString formateNiceTimeOffset(qint64 secs)
     return timeBehindText;
 }
 
-void ClickableLabel::mousePressEvent(QMouseEvent *event)
+void ClickableLabel::mouseReleaseEvent(QMouseEvent *event)
+{
+    Q_EMIT clicked(event->pos());
+}
+    
+void ClickableProgressBar::mouseReleaseEvent(QMouseEvent *event)
 {
     Q_EMIT clicked(event->pos());
 }
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -202,20 +202,6 @@ namespace GUIUtil
 
     QString formateNiceTimeOffset(qint64 secs);
 
-#if defined(Q_OS_MAC) && QT_VERSION >= 0x050000
-    // 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
-
     class ClickableLabel : public QLabel
     {
         Q_OBJECT
@@ -226,8 +212,35 @@ namespace GUIUtil
          */
         void clicked(const QPoint& point);
     protected:
-        void mousePressEvent(QMouseEvent *event);
+        void mouseReleaseEvent(QMouseEvent *event);
+    };
+    
+    class ClickableProgressBar : public QProgressBar
+    {
+        Q_OBJECT
+        
+    Q_SIGNALS:
+        /** Emitted when the progressbar is clicked. The relative mouse coordinates of the click are
+         * passed to the signal.
+         */
+        void clicked(const QPoint& point);
+    protected:
+        void mouseReleaseEvent(QMouseEvent *event);
+    };
+
+#if defined(Q_OS_MAC) && QT_VERSION >= 0x050000
+    // 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 ClickableProgressBar
+    {
+        bool event(QEvent *e) {
+            return (e->type() != QEvent::StyleAnimationUpdate) ? QProgressBar::event(e) : false;
+        }
     };
+#else
+    typedef ClickableProgressBar ProgressBar;
+#endif
 
 } // namespace GUIUtil
 
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
@@ -137,6 +137,13 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri
     }
 }
 
+void ModalOverlay::toggleVisibility()
+{
+    showHide(layerIsVisible, true);
+    if (!layerIsVisible)
+        userClosed = true;
+}
+
 void ModalOverlay::showHide(bool hide, bool userRequested)
 {
     if ( (layerIsVisible && !hide) || (!layerIsVisible && hide) || (!hide && userClosed && !userRequested))
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h
@@ -25,9 +25,11 @@ public Q_SLOTS:
     void tipUpdate(int count, const QDateTime& blockDate, double nVerificationProgress);
     void setKnownBestHeight(int count, const QDateTime& blockDate);
 
+    void toggleVisibility();
     // will show or hide the modal layer
     void showHide(bool hide = false, bool userRequested = false);
     void closeClicked();
+    bool isLayerVisible() { return layerIsVisible; }
 
 protected:
     bool eventFilter(QObject * obj, QEvent * ev);

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@`
`46`	`46`	`#include <QMenuBar>`
`47`	`47`	`#include <QMessageBox>`
`48`	`48`	`#include <QMimeData>`
`49`		`-#include <QProgressBar>`
`50`	`49`	`#include <QProgressDialog>`
`51`	`50`	`#include <QSettings>`
`52`	`51`	`#include <QShortcut>`
`@@ -251,6 +250,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle _platformStyle, const NetworkStyle `
`251`	`250`	`if(enableWallet) {`
`252`	`251`	`connect(walletFrame, SIGNAL(requestedSyncWarningInfo()), this, SLOT(showModalOverlay()));`
`253`	`252`	`connect(labelBlocksIcon, SIGNAL(clicked(QPoint)), this, SLOT(showModalOverlay()));`
	`253`	`+ connect(progressBar, SIGNAL(clicked(QPoint)), this, SLOT(showModalOverlay()));`
`254`	`254`	`}`
`255`	`255`	`#endif`
`256`	`256`	`}`
`@@ -1138,8 +1138,8 @@ void BitcoinGUI::setTrayIconVisible(bool fHideTrayIcon)`
`1138`	`1138`
`1139`	`1139`	`void BitcoinGUI::showModalOverlay()`
`1140`	`1140`	`{`
`1141`		`- if (modalOverlay)`
`1142`		`- modalOverlay->showHide(false, true);`
	`1141`	`+ if (modalOverlay && (progressBar->isVisible() \|\| modalOverlay->isLayerVisible()))`
	`1142`	`+ modalOverlay->toggleVisibility();`
`1143`	`1143`	`}`
`1144`	`1144`
`1145`	`1145`	`static bool ThreadSafeMessageBox(BitcoinGUI *gui, const std::string& message, const std::string& caption, unsigned int style)`
Original file line number	Diff line number	Diff line change
`@@ -988,7 +988,12 @@ QString formateNiceTimeOffset(qint64 secs)`
`988`	`988`	`return timeBehindText;`
`989`	`989`	`}`
`990`	`990`
`991`		`-void ClickableLabel::mousePressEvent(QMouseEvent *event)`
	`991`	`+void ClickableLabel::mouseReleaseEvent(QMouseEvent *event)`
	`992`	`+{`
	`993`	`+ Q_EMIT clicked(event->pos());`
	`994`	`+}`
	`995`	`+`
	`996`	`+void ClickableProgressBar::mouseReleaseEvent(QMouseEvent *event)`
`992`	`997`	`{`
`993`	`998`	`Q_EMIT clicked(event->pos());`
`994`	`999`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,13 @@ void ModalOverlay::tipUpdate(int count, const QDateTime& blockDate, double nVeri`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
	`140`	`+void ModalOverlay::toggleVisibility()`
	`141`	`+{`
	`142`	`+ showHide(layerIsVisible, true);`
	`143`	`+ if (!layerIsVisible)`
	`144`	`+ userClosed = true;`
	`145`	`+}`
	`146`	`+`
`140`	`147`	`void ModalOverlay::showHide(bool hide, bool userRequested)`
`141`	`148`	`{`
`142`	`149`	`if ( (layerIsVisible && !hide) \|\| (!layerIsVisible && hide) \|\| (!hide && userClosed && !userRequested))`