aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2018-04-23 20:58:33 +0200
committerWladimir J. van der Laan <[email protected]>2018-04-23 21:01:08 +0200
commit8609ddb368218c70c337a09bc3f354974bba1b26 (patch)
tree7f0af18421509b77e26c99dd70016cb090832f18 /src
parentMerge #13030: [bugfix] [wallet] Fix zapwallettxes/multiwallet interaction. (diff)
parentqt:Show the entire Window when double clicking on taskbar (diff)
downloaddiscoin-8609ddb368218c70c337a09bc3f354974bba1b26.tar.xz
discoin-8609ddb368218c70c337a09bc3f354974bba1b26.zip
Merge #12999: qt: Show the Window when double clicking the taskbar icon
67bf2aa qt:Show the entire Window when double clicking on taskbar (Chun Kuan Lee) Pull request description: fix #12838 Tree-SHA512: 4498bc1fe52efeed3768d6bdd7941e4b036d52ae80d9c1b6679c6daa3a62aeda4cff0c91fe1c65afaea6049c59cb0296fdcbff63ecb342d518615a92361fda7f
Diffstat (limited to 'src')
-rw-r--r--src/qt/bitcoingui.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index bfa8844a0..aed5374a7 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -968,6 +968,11 @@ void BitcoinGUI::changeEvent(QEvent *e)
QTimer::singleShot(0, this, SLOT(hide()));
e->ignore();
}
+ else if((wsevt->oldState() & Qt::WindowMinimized) && !isMinimized())
+ {
+ QTimer::singleShot(0, this, SLOT(show()));
+ e->ignore();
+ }
}
}
#endif