Changeset 488 for trunk/NewView/MainForm.pas

Timestamp:

Oct 25, 2023, 2:23:54 PM (22 months ago)

Author:

ataylor

Message:

Small fix to positioning logic when existing window is open.

File:

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

trunk/NewView/MainForm.pas

@@ -3828 +3828 @@
     if WinQueryWindowPos( hTopWindow,TopHelpWindowPos ) then
     begin
-      // [ALT 2023-10-22] ...but only if it's fully on the screen
+      // [ALT 2023-10-24] ...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 )
+         ( TopHelpWindowPos.X + Width + Offset <= Screen.Width ) and
+         ( TopHelpWindowPos.Y >= Offset ) and
+         ( TopHelpWindowPos.Y + Height + Offset <= Screen.Height )
       then
       Begin
@@ -3846 +3846 @@
       end;
 
-      // got the reference position, now apply the offset
-      Left := Left + Offset;
-      Bottom := Bottom - Offset;
+      // got the reference position, now apply the offset (but staying on screen)
+      if Left + Width + Offset <= Screen.Width then
+        Left := Left + Offset;
+      Bottom := Max( 0, Bottom - Offset );
 
       // I guess I am leaving width/height out for compatibility...?