Page MenuHomePhabricator
Files F13711217

D9994.id29692.diff
No OneTemporary
Actions

D9994.id29692.diff
View Options

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -110,6 +110,8 @@
Q_EMIT consoleShown(rpcConsole);
}
+ modalOverlay = new ModalOverlay(enableWallet, this->centralWidget());
+
// Accept D&D of URIs
setAcceptDrops(true);
@@ -203,7 +205,6 @@
connect(labelProxyIcon, &GUIUtil::ClickableLabel::clicked,
[this] { openOptionsDialogWithTab(OptionsDialog::TAB_NETWORK); });
- modalOverlay = new ModalOverlay(enableWallet, this->centralWidget());
connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this,
&BitcoinGUI::showModalOverlay);
connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this,
@@ -243,6 +244,8 @@
void BitcoinGUI::createActions() {
QActionGroup *tabGroup = new QActionGroup(this);
+ connect(modalOverlay, &ModalOverlay::triggered, tabGroup,
+ &QActionGroup::setEnabled);
overviewAction =
new QAction(platformStyle->SingleColorIcon(":/icons/overview"),
diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h
--- a/src/qt/modaloverlay.h
+++ b/src/qt/modaloverlay.h
@@ -25,17 +25,21 @@
explicit ModalOverlay(bool enable_wallet, QWidget *parent);
~ModalOverlay();
-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() const { return layerIsVisible; }
+public Q_SLOTS:
+ void toggleVisibility();
+ void closeClicked();
+
+Q_SIGNALS:
+ void triggered(bool hidden);
+
protected:
bool eventFilter(QObject *obj, QEvent *ev) override;
bool event(QEvent *ev) override;
diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp
--- a/src/qt/modaloverlay.cpp
+++ b/src/qt/modaloverlay.cpp
@@ -190,6 +190,8 @@
return;
}
+ Q_EMIT triggered(hide);
+
if (!isVisible() && !hide) {
setVisible(true);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 26, 11:00 (10 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5571466
Default Alt Text
D9994.id29692.diff (2 KB)

Event Timeline