Changeset 622 for trunk/LocalPlayer

Timestamp:

Sep 15, 2024, 10:04:45 PM (2 months ago)

Author:

chronos

Message:

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

Location:

trunk/LocalPlayer

Files:

• Battle.pas (modified) (1 diff)
• CityScreen.pas (modified) (1 diff)
• Diagram.pas (modified) (1 diff)
• Draft.pas (modified) (1 diff)
• Enhance.pas (modified) (1 diff)
• MessgEx.pas (modified) (1 diff)
• Nego.pas (modified) (2 diffs)
• Rates.pas (modified) (1 diff)
• Select.pas (modified) (2 diffs)
• TechTree.pas (modified) (1 diff)
• Term.pas (modified) (5 diffs)
• UnitStat.pas (modified) (2 diffs)

trunk/LocalPlayer/Battle.pas

@@ -207 +207 @@
     OKBtn.Visible := True;
     CancelBtn.Visible := True;
-    Left := (Screen.Width - ClientWidth) div 2; // center on screen
-    Top := (Screen.Height - ClientHeight) div 2;
+    CenterToScreen;
   end
   else

trunk/LocalPlayer/CityScreen.pas

@@ -1100 +1100 @@
       end;
 
-  if WindowMode = wmModal then
-  begin { center on screen }
-    Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
-  end;
+  if WindowMode = wmModal then CenterToScreen;
 
   Caption := CityName(C.ID);

trunk/LocalPlayer/Diagram.pas

@@ -291 +291 @@
 procedure TDiaDlg.FormShow(Sender: TObject);
 begin
-  if WindowMode = wmModal then
-  begin { center on screen }
-    Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
-  end;
+  if WindowMode = wmModal then CenterToScreen;
   OffscreenPaint;
 end;

trunk/LocalPlayer/Draft.pas

@@ -485 +485 @@
   yView := yView0 - Cut;
 
-  if WindowMode = wmModal then
-  begin { center on screen }
-    Left := (Screen.Width - Template.Width) div 2;
-    Top := (Screen.Height - (Template.Height - Cut)) div 2;
-  end;
+  if WindowMode = wmModal then CenterToScreen(Template.Width, Template.Height - Cut);
 
   SetDomain(Domain);

trunk/LocalPlayer/Enhance.pas

@@ -131 +131 @@
   TypeChanged: Boolean;
 begin
-  OffscreenUser := Self;
+  inherited;
   Offscreen.Canvas.Font.Assign(UniFont[ftSmall]);
   FillOffscreen(0, 0, InnerWidth, InnerHeight);

trunk/LocalPlayer/MessgEx.pas

@@ -169 +169 @@
     0:
       begin
-        Left := (Screen.Width - Width) div 2;
-        Top := (Screen.Height - Height) div 2 - MapCenterUp;
+        Left := Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - Width) div 2;
+        Top := Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - Height) div 2 - MapCenterUp;
       end;
     1:
       begin
-        Left := (Screen.Width - Width) div 4;
-        Top := (Screen.Height - Height) * 2 div 3 - MapCenterUp;
+        Left := Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - Width) div 4;
+        Top := Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - Height) * 2 div 3 - MapCenterUp;
       end;
     -1:
       begin
-        Left := (Screen.Width - Width) div 4;
-        Top := (Screen.Height - Height) div 3 - MapCenterUp;
+        Left := Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - Width) div 4;
+        Top := Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - Height) div 3 - MapCenterUp;
       end;
   end;

trunk/LocalPlayer/Nego.pas

@@ -485 +485 @@
   OkEnabled: Boolean;
 begin
-  if (OffscreenUser <> nil) and (OffscreenUser <> Self) then
-    OffscreenUser.Update;
-  // complete working with old owner to prevent rebound
-  OffscreenUser := Self;
+  inherited;
 
   if (DipCommand >= 0) and (Page = History[Me].N) then
@@ -917 +914 @@
       { opLowTreaty:
         begin
-        if MyRO.Treaty[DipMem[Me].pContact]=trNone then Price:=opTreaty+trCeaseFire
-        else Price:=opTreaty+MyRO.Treaty[DipMem[Me].pContact]-1;
+        if MyRO.Treaty[DipMem[Me].pContact] = trNone then Price := opTreaty + trCeaseFire
+        else Price := opTreaty + MyRO.Treaty[DipMem[Me].pContact]-  1;
         end }
     end;

trunk/LocalPlayer/Rates.pas

@@ -40 +40 @@
 procedure TRatesDlg.FormCreate(Sender: TObject);
 begin
-  TitleHeight := Screen.Height;
+  TitleHeight := Screen.PrimaryMonitor.Height;
   InitButtons;
 end;

trunk/LocalPlayer/Select.pas

@@ -1545 +1545 @@
 var
   I: Integer;
+  NewTop, NewLeft: Integer;
 begin
   Result := -1;
@@ -1643 +1644 @@
   begin { center on screen }
     if Kind = kTribe then
-      Left := (Screen.Width - 800) * 3 div 8 + 130
+      NewLeft := Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - 800) * 3 div 8 + 130
     else
-      Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
+      NewLeft := Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - Width) div 2;
+    NewTop := Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - Height) div 2;
     if Kind = kProject then
-      Top := Top + 48;
+      NewTop := NewTop + 48;
+    BoundsRect := Bounds(NewLeft, NewTop, Width, Height);
   end;
 

trunk/LocalPlayer/TechTree.pas

@@ -214 +214 @@
 
   // Fit window to image, center image in window, center window to screen
-  NewWidth := Min(Screen.Width - 40, Image.Width + LeftBorder + RightBorder +
+  NewWidth := Min(Screen.PrimaryMonitor.Width - 40, Image.Width + LeftBorder + RightBorder +
     2 * BlackBorder);
-  NewHeight := Min(Screen.Height - 40, Image.Height + TopBorder + BottomBorder +
+  NewHeight := Min(Screen.PrimaryMonitor.Height - 40, Image.Height + TopBorder + BottomBorder +
     2 * BlackBorder);
-  BoundsRect := Bounds((Screen.Width - NewWidth) div 2,
-    (Screen.Height - NewHeight) div 2, NewWidth, NewHeight);
+  BoundsRect := Bounds(Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - NewWidth) div 2,
+    Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - NewHeight) div 2, NewWidth, NewHeight);
   CloseBtn.Left := Width - CloseBtn.Width - BlackBorder - 8;
   CloseBtn.Top := BlackBorder + 8;

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;

trunk/LocalPlayer/UnitStat.pas

@@ -77 +77 @@
   NoMap := TIsoMap.Create;
   AgePrepared := -2;
-  TitleHeight := Screen.Height;
+  TitleHeight := Screen.PrimaryMonitor.Height;
   InitButtons;
 
@@ -164 +164 @@
   if Kind in [dkOwnModel, dkEnemyModel] then
   begin
-    Left := UserLeft;
-    Top := UserTop;
+    BoundsRect := Bounds(UserLeft, UserTop, Width, Height);
   end else begin
-    Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
+    BoundsRect := Bounds(Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - Width) div 2,
+      Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - Height) div 2,
+      Width, Height);
   end;