diff options
| author | Hennadii Stepanov <[email protected]> | 2020-07-11 12:59:58 +0300 |
|---|---|---|
| committer | Hennadii Stepanov <[email protected]> | 2020-07-11 12:59:58 +0300 |
| commit | d0cc1f6df740e03ca0213a3754c3277b01ae2c05 (patch) | |
| tree | e2ed7e1aa8c63da5816c0dcae349accdc17b5799 | |
| parent | qt, refactor: Cleanup ModalOverlay slots (diff) | |
| download | discoin-d0cc1f6df740e03ca0213a3754c3277b01ae2c05.tar.xz discoin-d0cc1f6df740e03ca0213a3754c3277b01ae2c05.zip | |
qt: Disable toolbar when overlay is shown
| -rw-r--r-- | src/qt/bitcoingui.cpp | 4 | ||||
| -rw-r--r-- | src/qt/modaloverlay.cpp | 2 | ||||
| -rw-r--r-- | src/qt/modaloverlay.h | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 65f226a92..5d6efeeed 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -112,6 +112,8 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty Q_EMIT consoleShown(rpcConsole); } + modalOverlay = new ModalOverlay(enableWallet, this->centralWidget()); + // Accept D&D of URIs setAcceptDrops(true); @@ -201,7 +203,6 @@ BitcoinGUI::BitcoinGUI(interfaces::Node& node, const PlatformStyle *_platformSty openOptionsDialogWithTab(OptionsDialog::TAB_NETWORK); }); - modalOverlay = new ModalOverlay(enableWallet, this->centralWidget()); connect(labelBlocksIcon, &GUIUtil::ClickableLabel::clicked, this, &BitcoinGUI::showModalOverlay); connect(progressBar, &GUIUtil::ClickableProgressBar::clicked, this, &BitcoinGUI::showModalOverlay); #ifdef ENABLE_WALLET @@ -238,6 +239,7 @@ BitcoinGUI::~BitcoinGUI() void BitcoinGUI::createActions() { QActionGroup *tabGroup = new QActionGroup(this); + connect(modalOverlay, &ModalOverlay::triggered, tabGroup, &QActionGroup::setEnabled); overviewAction = new QAction(platformStyle->SingleColorIcon(":/icons/overview"), tr("&Overview"), this); overviewAction->setStatusTip(tr("Show general overview of wallet")); diff --git a/src/qt/modaloverlay.cpp b/src/qt/modaloverlay.cpp index 0ba1beaf3..8070aa627 100644 --- a/src/qt/modaloverlay.cpp +++ b/src/qt/modaloverlay.cpp @@ -171,6 +171,8 @@ void ModalOverlay::showHide(bool hide, bool userRequested) if ( (layerIsVisible && !hide) || (!layerIsVisible && hide) || (!hide && userClosed && !userRequested)) return; + Q_EMIT triggered(hide); + if (!isVisible() && !hide) setVisible(true); diff --git a/src/qt/modaloverlay.h b/src/qt/modaloverlay.h index 69542c851..7b0777764 100644 --- a/src/qt/modaloverlay.h +++ b/src/qt/modaloverlay.h @@ -36,6 +36,9 @@ 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; |