Changeset 487 for trunk

Timestamp:

Oct 25, 2023, 12:46:56 AM (22 months ago)

Author:

ataylor

Message:

Automatically set system-modal state when called from a system modal window.

File:

• trunk/NewView/MainForm.pas (modified) (5 diffs)

trunk/NewView/MainForm.pas

@@ -899 +899 @@
   g_ExternalLinkKeepCurrent: boolean; // whether to keep current files open
 
+  g_LastSysModalWindow: HWND;
+
 //
 // ----------------------------------------------------------------------------------------
@@ -3704 +3706 @@
   Settings.MRUList.Destroy;
 
+  // [20231023 ALT] Restore any previous system-modal window state
+  if g_LastSysModalWindow <> NULLHANDLE then
+  begin
+    WinSetSysModalWindow( HWND_DESKTOP, g_LastSysModalWindow );
+  end;
+
   // TODO rbri maybe we have to do this
   // Parameters.FilenamesParam.Destroy;
@@ -3914 +3922 @@
   LogEvent(LogStartup, 'Starting NewView: MainFormOnCreate');
 
+  g_LastSysModalWindow := NULLHANDLE;
+
   Application.OnHint := OnHint;
 
@@ -4115 +4125 @@
     WinSetOwner( Frame.Handle,
                  CmdLineParameters.getOwnerWindow );
-{
-    // ALT 20230523 try to handle system modal owner
-    if WinQuerySysModelWindow( HWND_DESKTOP ) = CmdLineParameters.getOwnerWindow then
-    begin
-      WinSetWindowBits( FindTopFormWindow( MAIN_WINDOW_CLASS_NAME ),
-                        QWL_STYLE, WS_TOPMOST, WS_TOPMOST );
-    end;
-}
   end;
 
@@ -4330 +4332 @@
 
   StartingUp := false;
+
+  // ALT 20231023 handle system modal owner
+  g_LastSysModalWindow := WinQuerySysModalWindow( HWND_DESKTOP );
+  if g_LastSysModalWindow <> NULLHANDLE then
+  begin
+    WinSetSysModalWindow( HWND_DESKTOP, Frame.Handle );
+  end;
 
   LogEvent(LogStartup, 'RUN PROGRAM');