Changeset 493 for trunk/NewView/MainForm.pas

Timestamp:

Dec 29, 2023, 2:09:06 AM (20 months ago)

Author:

ataylor

Message:

Undo TForm changes (rollback r492). Opening when window is system-modal now
simply clears system-modality for the lifetime of the NewView application, and
restores it on exit.

File:

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

trunk/NewView/MainForm.pas

@@ -521 +521 @@
 
     // ALT 2023-12-24
-    Procedure CheckSetSysModal(FormWindow: TForm);
-    Procedure CheckUnsetSysModal;
+    Procedure CheckSaveSysModal(FormWindow: TForm);
+    Procedure CheckReturnSysModal;
 
     // Bookmarks ------------------------------------------
@@ -3746 +3746 @@
   end;
   }
-  CheckUnsetSysModal;
+  CheckReturnSysModal;
 
   // TODO rbri maybe we have to do this
@@ -4379 +4379 @@
   }
   // [ALT 2023-12-26] move above to procedure
-  CheckSetSysModal(Self);
+  CheckSaveSysModal(Self);
 
   LogEvent(LogStartup, 'RUN PROGRAM');
@@ -4701 +4701 @@
     EndUpdate;
   end;
-//  CheckSetSysModal(InformationForm);
+//  CheckSaveSysModal(InformationForm);
   InformationForm.ShowModal;
-//  CheckSetSysModal(Self);
+//  CheckSaveSysModal(Self);
 End;
 
@@ -7217 +7217 @@
 end;
 
-
-Procedure TMainForm.CheckSetSysModal(FormWindow: TForm);
+Procedure TMainForm.CheckSaveSysModal(FormWindow: TForm);
 begin
   // Override any existing system-modal state
   if g_LastSysModalWindow <> NULLHANDLE then
   begin
-    WinSetSysModalWindow( HWND_DESKTOP, FormWindow.Frame.Handle );
-  end;
-end;
-
-
-Procedure TMainForm.CheckUnsetSysModal;
+    //WinSetSysModalWindow( HWND_DESKTOP, FormWindow.Frame.Handle );
+    WinSetSysModalWindow( HWND_DESKTOP, NULLHANDLE );
+    WinSetActiveWindow( HWND_DESKTOP, FormWindow.Frame.Handle );
+  end;
+end;
+
+Procedure TMainForm.CheckReturnSysModal;
 begin
   // Restore any previous system-modal window state
@@ -7234 +7234 @@
   begin
     WinSetSysModalWindow( HWND_DESKTOP, g_LastSysModalWindow );
+    WinSetActiveWindow( HWND_DESKTOP, g_LastSysModalWindow );
   end;
 end;