Changeset 622 for trunk/LocalPlayer/Term.pas

Timestamp:

Sep 15, 2024, 10:04:45 PM (4 days ago)

Author:

chronos

Message:

• Modified: Show windows by default on primary screen if multiple monitors present.

File:

• trunk/LocalPlayer/Term.pas (modified) (5 diffs)

trunk/LocalPlayer/Term.pas

@@ -12 +12 @@
 {$ENDIF}
   Protocol, Tribes, PVSB, ClientTools, ScreenTools, BaseWin, Messg, ButtonBase,
-  LCLIntf, LCLType, Menus, SysUtils, Classes, DrawDlg, Types, Math,
+  LCLIntf, LCLType, SysUtils, Classes, DrawDlg, Types, Math,
   DateUtils, Platform, ButtonB, ButtonC, EOTButton, Area, Help,
   GraphicSet, MiniMap, IsoEngine, Wonders, TechTree, Enhance, Nego, CityType,
@@ -2643 +2643 @@
           MainTexture.Age := -1;
         Tribes.Init;
-        HelpDlg.UserLeft := (Screen.Width - HelpDlg.Width) div 2;
-        HelpDlg.UserTop := (Screen.Height - HelpDlg.Height) div 2;
+        HelpDlg.UserLeft := Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - HelpDlg.Width) div 2;
+        HelpDlg.UserTop := Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - HelpDlg.Height) div 2;
         HelpDlg.Difficulty := 0;
         if Command = cStartCredits then
@@ -5963 +5963 @@
       if BattleDlg.Left < 0 then
         BattleDlg.Left := 0
-      else if BattleDlg.Left + BattleDlg.Width > Screen.Width then
-        BattleDlg.Left := Screen.Width - BattleDlg.Width;
+      else if BattleDlg.Left + BattleDlg.Width > Screen.DesktopWidth then
+        BattleDlg.Left := Screen.DesktopWidth - BattleDlg.Width;
       BattleDlg.Top := Y - BattleDlg.Height div 2;
       if BattleDlg.Top < 0 then
         BattleDlg.Top := 0
-      else if BattleDlg.Top + BattleDlg.Height > Screen.Height then
-        BattleDlg.Top := Screen.Height - BattleDlg.Height;
+      else if BattleDlg.Top + BattleDlg.Height > Screen.DesktopHeight then
+        BattleDlg.Top := Screen.DesktopHeight - BattleDlg.Height;
       BattleDlg.IsSuicideQuery := False;
       BattleDlg.Show;
@@ -8065 +8065 @@
 procedure TMainScreen.FormShow(Sender: TObject);
 begin
-  if FullScreen then BoundsRect := Bounds(0, 0, Screen.Width, Screen.Height)
+  if FullScreen then BoundsRect := Screen.PrimaryMonitor.BoundsRect
     else BoundsRect := TermBounds;
   FormRestoredSize := TermBounds;
@@ -8387 +8387 @@
 
   if Form is TListDlg then begin;
-    ListDlg.UserLeft := 8;
-    ListDlg.UserTop := TopBarHeight + 8;
+    ListDlg.UserLeft := Screen.PrimaryMonitor.Left + 8;
+    ListDlg.UserTop := Screen.PrimaryMonitor.Top + TopBarHeight + 8;
   end;
   if Form is THelpDlg then begin
-   HelpDlg.UserLeft := Screen.Width - HelpDlg.Width - 8;
-    HelpDlg.UserTop := TopBarHeight + 8;
+    HelpDlg.UserLeft := Screen.PrimaryMonitor.Left + Screen.PrimaryMonitor.Width - HelpDlg.Width - 8;
+    HelpDlg.UserTop := Screen.PrimaryMonitor.Top + TopBarHeight + 8;
   end;
   if Form is TUnitStatDlg then begin
-    UnitStatDlg.UserLeft := 397;
-    UnitStatDlg.UserTop := TopBarHeight + 64;
+    UnitStatDlg.UserLeft := Screen.PrimaryMonitor.Left + 397;
+    UnitStatDlg.UserTop := Screen.PrimaryMonitor.Top + TopBarHeight + 64;
   end;
   if Form is TDiaDlg then begin
-    DiaDlg.UserLeft := (Screen.Width - DiaDlg.Width) div 2;
-    DiaDlg.UserTop := (Screen.Height - DiaDlg.Height) div 2;
+    DiaDlg.UserLeft := Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - DiaDlg.Width) div 2;
+    DiaDlg.UserTop := Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - DiaDlg.Height) div 2;
   end;
   if Form is TNatStatDlg then begin
-    NatStatDlg.UserLeft := Screen.Width - NatStatDlg.Width - 8;
-    NatStatDlg.UserTop := Screen.Height - PanelHeight - NatStatDlg.Height - 8;
+    NatStatDlg.UserLeft := Screen.PrimaryMonitor.Left + Screen.PrimaryMonitor.Width - NatStatDlg.Width - 8;
+    NatStatDlg.UserTop := Screen.PrimaryMonitor.Top + Screen.PrimaryMonitor.Height - PanelHeight - NatStatDlg.Height - 8;
     if NatStatDlg.UserTop < 8 then
       NatStatDlg.UserTop := 8;