From: CryptoManiac <CryptoManiac@users.noreply.github.com>
Date: Wed, 3 Dec 2014 22:59:27 +0000 (+0300)
Subject: Merge pull request #73 from fsb4000/patch-1
X-Git-Tag: nvc-v0.5.0~10
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=598dc1e758825e406675e64720d3c600f7f36a27;hp=b7f085461f3ee2b54f8c92abb2c38b5e12c963d8;p=novacoin.git

Merge pull request #73 from fsb4000/patch-1

fix minimizing qt app
---

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 05a0258..87357ca 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1178,18 +1178,26 @@ void BitcoinGUI::showNormalIfMinimized(bool fToggleHidden)
     // activateWindow() (sometimes) helps with keyboard focus on Windows
     if (isHidden())
     {
+        // Make sure the window is not minimized
+        setWindowState(windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
+        // Then show it
         show();
+        raise();
         activateWindow();
     }
     else if (isMinimized())
     {
         showNormal();
+        raise();
         activateWindow();
     }
     else if (GUIUtil::isObscured(this))
     {
         raise();
         activateWindow();
+        Sleep(1);
+        if (GUIUtil::isObscured(this))
+            hide();
     }
     else if(fToggleHidden)
         hide();