Changeset 41 for trunk/bitmap.cpp

Timestamp:

Mar 17, 2018, 11:00:45 PM (7 years ago)

Author:

Gregg Young

Message:

Fix hang on non-full screen capture of window with a menu open; Fix failure of widow to come to the top when program set as always on top are running. Add part of window title to auto file names; Major overhaul of settings dialog for Gotcha Quiet. More _QUIET_ ifdefs added to split code where Gotcha and Gotcha Quiet differ.

File:

• trunk/bitmap.cpp (modified) (1 diff)

trunk/bitmap.cpp

@@ -33 +33 @@
     SWP     swp;
     SHORT   sWidth, sHeight;
-    CHAR    ach[32];
+    CHAR    ach[32] = {0};
 
     // wait for the selected window to rise to the surface
     if (f)
     {
-        WinSetWindowPos (hwndParent, HWND_TOP, 0,0, 0,0, SWP_ZORDER);
+        WinSetFocus(HWND_DESKTOP, hwndParent);
         // FIXME uh, yukki! polling! but seems to be the easiest way for now.
         for (USHORT i = 0; i < MAX_WAIT; i++)
         {
             DosSleep (100);
+            if (hwndParent == WinQueryFocus(HWND_DESKTOP)) {
+                break;
+            }
+            else
+            {
+                // check if topmost window is a menu
+                WinQueryClassName (WinQueryFocus(HWND_DESKTOP),
+                                   sizeof (ach), ach);
+                if (stricmp (ach, "#4") == 0)
+                    break;
+            }
             WinQueryWindowPos (hwndParent, &swp);
             if ((swp.hwndInsertBehind == HWND_TOP) ||
-                (swp.hwndInsertBehind == hwndSnapshot))
+                (swp.hwndInsertBehind == hwndSnapshot)) {
                 break;
+            }
             else
             {