Changeset 486

Timestamp:

Oct 22, 2023, 7:39:15 PM (22 months ago)

Author:

ataylor

Message:

Make sure help window doesn't open off-screen (e.g. on another virtual desktop)

Location:

trunk/NewView

Files:

• MainForm.pas (modified) (3 diffs)
• VersionUnit.pas (modified) (1 diff)

trunk/NewView/MainForm.pas

@@ -3812 +3812 @@
   if hTopWindow <> NULLHANDLE then
   begin
-    // found an existing help window, find it's location
-    if WinQueryWindowPos(
-         hTopWindow,
-         TopHelpWindowPos ) then
+
+    // we will offset new window by height of title bar + border
+    Offset := Screen.SystemMetrics( smCyTitleBar )
+              + Screen.SystemMetrics( smCySizeBorder );
+
+    // found an existing help window, find its position...
+    if WinQueryWindowPos( hTopWindow,TopHelpWindowPos ) then
     begin
-      if ( TopHelpWindowPos.FL and ( SWP_MINIMIZE or SWP_MINIMIZE ) ) > 0 then
+      // [ALT 2023-10-22] ...but only if it's fully on the screen
+      if ( TopHelpWindowPos.X >= 0 ) and
+         ( TopHelpWindowPos.X + TopHelpWindowPos.CX + Offset <= Screen.Width ) and
+         ( TopHelpWindowPos.Y >= 0 ) and
+         ( TopHelpWindowPos.Y + TopHelpWindowPos.CY + Offset <= Screen.Height )
+      then
       Begin
-        // window is maximized or minimised, so get the restore position from window USHORTs
-        TopHelpWindowPos.x := WinQueryWindowUShort( hTopWindow, QWS_XRESTORE );
-        TopHelpWindowPos.Y := WinQueryWindowUShort( hTopWindow, QWS_YRESTORE );
+        if ( TopHelpWindowPos.FL and ( SWP_MINIMIZE or SWP_MINIMIZE ) ) > 0 then
+        Begin
+          // window is maximized or minimised, so get the restore position from window USHORTs
+          TopHelpWindowPos.x := WinQueryWindowUShort( hTopWindow, QWS_XRESTORE );
+          TopHelpWindowPos.Y := WinQueryWindowUShort( hTopWindow, QWS_YRESTORE );
+        end;
+
+        Left := TopHelpWindowPos.x;
+        Bottom := TopHelpWindowPos.y;
       end;
 
-      // offset new window by height of title bar + border
-      Offset := Screen.SystemMetrics( smCyTitleBar )
-                + Screen.SystemMetrics( smCySizeBorder );
-      Left := TopHelpWindowPos.x + Offset;
-      Bottom := TopHelpWindowPos.y - Offset;
+      // got the reference position, now apply the offset
+      Left := Left + Offset;
+      Bottom := Bottom - Offset;
 
       // I guess I am leaving width/height out for compatibility...?
@@ -4103 +4115 @@
     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;
 
@@ -4557 +4576 @@
     exit;
 
-  tmpMatchIndex := -1; 
+  tmpMatchIndex := -1;
   tmpSearchText := trim(IndexSearchEdit.Text);
 

trunk/NewView/VersionUnit.pas

@@ -17 +17 @@
 
 const
-  Version =        'V2.19.8'; // $SS_REQUIRE_NEW_VERSION$
-  BldLevelVersion = '2.19.8'; // Embedded for IBM BLDLEVEL tool
+  Version =        'V2.19.8a'; // $SS_REQUIRE_NEW_VERSION$
+  BldLevelVersion = '2.19.8a'; // Embedded for IBM BLDLEVEL tool
   CopyrightMsg = 'Copyright 2005 Aaron Lawrence; 2006-2019 Ronald Brill';
   LicenseMsg   = 'Licensed under the GNU Public License';