tune console window restore from minimize

HydraheadHunter · Dec 16, 2020 · e7357e0 · e7357e0
1 parent 83fcefd
commit e7357e0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -72,7 +72,7 @@ build/
 bld/
 [Bb]in/
 [Oo]bj/
-
+enc_temp_folder/
 # Roslyn cache directories
 *.ide/
 

diff --git a/capsicain/capsicain.cpp b/capsicain/capsicain.cpp
@@ -15,7 +15,7 @@
 
 using namespace std;
 
-const string VERSION = "62";
+const string VERSION = "63alpha";
 
 string SCANCODE_LABELS[256]; // contains e.g. [01]="ESC" instead of SC_ESCAPE 
 
@@ -743,6 +743,7 @@ void processModifierState()
     }
 }
 
+//handle all REWIRE configs
 void processRewire()
 {
     if (option.flipAltWinOnAppleKeyboards && globalState.deviceIsAppleKeyboard)

diff --git a/capsicain/traybar.cpp b/capsicain/traybar.cpp
@@ -40,7 +40,15 @@ bool ShowInTaskbar()
 {
     if (IsCapsicainInTray())
         DeleteIconFromTraybar();
-    return ::ShowWindow(::GetConsoleWindow(), SW_SHOWDEFAULT);
+    HWND myWindow = ::GetConsoleWindow();
+    if (myWindow == NULL)
+    {
+        std::cout << std::endl << "BUG? GetConsoleWindow() failed";
+        return false;
+    }
+    ShowWindow(myWindow, SW_RESTORE);
+    SetForegroundWindow(myWindow);
+    return true;
 }
 
 bool ShowInTraybar()
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,7 @@ build/ @@
     bld/
     [Bb]in/
     [Oo]bj/
+    enc_temp_folder/
     # Roslyn cache directories
     *.ide/
@@ Expand Down @@