File tree Expand file tree Collapse file tree 2 files changed +7
-27
lines changed Expand file tree Collapse file tree 2 files changed +7
-27
lines changed Original file line number Diff line number Diff line change @@ -667,10 +667,7 @@ void BitcoinGUI::aboutClicked()
667
667
668
668
void BitcoinGUI::showDebugWindow ()
669
669
{
670
- rpcConsole->showNormal ();
671
- rpcConsole->show ();
672
- rpcConsole->raise ();
673
- rpcConsole->activateWindow ();
670
+ GUIUtil::bringToFront (rpcConsole);
674
671
}
675
672
676
673
void BitcoinGUI::showDebugWindowActivateConsole ()
@@ -1152,24 +1149,11 @@ void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden)
1152
1149
if (!clientModel)
1153
1150
return ;
1154
1151
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 ) {
1172
1153
hide ();
1154
+ } else {
1155
+ GUIUtil::bringToFront (this );
1156
+ }
1173
1157
}
1174
1158
1175
1159
void BitcoinGUI::toggleHidden ()
Original file line number Diff line number Diff line change @@ -292,19 +292,15 @@ void WalletView::usedSendingAddresses()
292
292
if (!walletModel)
293
293
return ;
294
294
295
- usedSendingAddressesPage->show ();
296
- usedSendingAddressesPage->raise ();
297
- usedSendingAddressesPage->activateWindow ();
295
+ GUIUtil::bringToFront (usedSendingAddressesPage);
298
296
}
299
297
300
298
void WalletView::usedReceivingAddresses ()
301
299
{
302
300
if (!walletModel)
303
301
return ;
304
302
305
- usedReceivingAddressesPage->show ();
306
- usedReceivingAddressesPage->raise ();
307
- usedReceivingAddressesPage->activateWindow ();
303
+ GUIUtil::bringToFront (usedReceivingAddressesPage);
308
304
}
309
305
310
306
void WalletView::showProgress (const QString &title, int nProgress)
You can’t perform that action at this time.
0 commit comments