qt: Use GUIUtil::bringToFront where possible

2018-08-31 23:16:34 +01:00
parent 5796671e1d
commit 6fc21aca6d
2 changed files with 7 additions and 27 deletions
@@ -667,10 +667,7 @@ void BitcoinGUI::aboutClicked()

 void BitcoinGUI::showDebugWindow()
 {
-    rpcConsole->showNormal();
-    rpcConsole->show();
-    rpcConsole->raise();
-    rpcConsole->activateWindow();
+    GUIUtil::bringToFront(rpcConsole);
 }

 void BitcoinGUI::showDebugWindowActivateConsole()
@@ -1152,24 +1149,11 @@ void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden)
    if(!clientModel)
        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);
+    }
 }

 void BitcoinGUI::toggleHidden()