diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -756,10 +756,7 @@ } void BitcoinGUI::showDebugWindow() { - rpcConsole->showNormal(); - rpcConsole->show(); - rpcConsole->raise(); - rpcConsole->activateWindow(); + GUIUtil::bringToFront(rpcConsole); } void BitcoinGUI::showDebugWindowActivateConsole() { @@ -1261,18 +1258,11 @@ return; } - // activateWindow() (sometimes) helps with keyboard focus on Windows - if (isHidden()) { - show(); - activateWindow(); - } else if (isMinimized()) { - showNormal(); - activateWindow(); - } else if (GUIUtil::isObscured(this)) { - raise(); - activateWindow(); - } else if (fToggleHidden) { + if (!isHidden() && !isMinimized() && !GUIUtil::isObscured(this) && + fToggleHidden) { hide(); + } else { + GUIUtil::bringToFront(this); } } diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -330,9 +330,7 @@ return; } - usedSendingAddressesPage->show(); - usedSendingAddressesPage->raise(); - usedSendingAddressesPage->activateWindow(); + GUIUtil::bringToFront(usedSendingAddressesPage); } void WalletView::usedReceivingAddresses() { @@ -340,9 +338,7 @@ return; } - usedReceivingAddressesPage->show(); - usedReceivingAddressesPage->raise(); - usedReceivingAddressesPage->activateWindow(); + GUIUtil::bringToFront(usedReceivingAddressesPage); } void WalletView::showProgress(const QString &title, int nProgress) {