Skip to content

Commit 6fc21ac

Browse files
committed
qt: Use GUIUtil::bringToFront where possible
1 parent 5796671 commit 6fc21ac

File tree

2 files changed

+7
-27
lines changed

2 files changed

+7
-27
lines changed

src/qt/bitcoingui.cpp

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -667,10 +667,7 @@ void BitcoinGUI::aboutClicked()
667667

668668
void BitcoinGUI::showDebugWindow()
669669
{
670-
rpcConsole->showNormal();
671-
rpcConsole->show();
672-
rpcConsole->raise();
673-
rpcConsole->activateWindow();
670+
GUIUtil::bringToFront(rpcConsole);
674671
}
675672

676673
void BitcoinGUI::showDebugWindowActivateConsole()
@@ -1152,24 +1149,11 @@ void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden)
11521149
if(!clientModel)
11531150
return;
11541151

1155-
// activateWindow() (sometimes) helps with keyboard focus on Windows
1156-
if (isHidden())
1157-
{
1158-
show();
1159-
activateWindow();
1160-
}
1161-
else if (isMinimized())
1162-
{
1163-
showNormal();
1164-
activateWindow();
1165-
}
1166-
else if (GUIUtil::isObscured(this))
1167-
{
1168-
raise();
1169-
activateWindow();
1170-
}
1171-
else if(fToggleHidden)
1152+
if (!isHidden() && !isMinimized() && !GUIUtil::isObscured(this) && fToggleHidden) {
11721153
hide();
1154+
} else {
1155+
GUIUtil::bringToFront(this);
1156+
}
11731157
}
11741158

11751159
void BitcoinGUI::toggleHidden()

src/qt/walletview.cpp

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -292,19 +292,15 @@ void WalletView::usedSendingAddresses()
292292
if(!walletModel)
293293
return;
294294

295-
usedSendingAddressesPage->show();
296-
usedSendingAddressesPage->raise();
297-
usedSendingAddressesPage->activateWindow();
295+
GUIUtil::bringToFront(usedSendingAddressesPage);
298296
}
299297

300298
void WalletView::usedReceivingAddresses()
301299
{
302300
if(!walletModel)
303301
return;
304302

305-
usedReceivingAddressesPage->show();
306-
usedReceivingAddressesPage->raise();
307-
usedReceivingAddressesPage->activateWindow();
303+
GUIUtil::bringToFront(usedReceivingAddressesPage);
308304
}
309305

310306
void WalletView::showProgress(const QString &title, int nProgress)

0 commit comments

Comments
 (0)