Changeset 622

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

Files:

• Back.lfm (modified) (1 diff)
• Back.pas (modified) (3 diffs)
• Inp.pas (modified) (1 diff)
• LocalPlayer/Battle.pas (modified) (1 diff)
• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/Diagram.pas (modified) (1 diff)
• LocalPlayer/Draft.pas (modified) (1 diff)
• LocalPlayer/Enhance.pas (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (1 diff)
• LocalPlayer/Nego.pas (modified) (2 diffs)
• LocalPlayer/Rates.pas (modified) (1 diff)
• LocalPlayer/Select.pas (modified) (2 diffs)
• LocalPlayer/TechTree.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (5 diffs)
• LocalPlayer/UnitStat.pas (modified) (2 diffs)
• NoTerm.pas (modified) (1 diff)
• Packages/CevoComponents/BaseWin.pas (modified) (1 diff)
• Packages/CevoComponents/DrawDlg.pas (modified) (3 diffs)
• Packages/DpiControls/Dpi.Forms.pas (modified) (7 diffs)
• Start.pas (modified) (3 diffs)

trunk/Back.lfm

@@ -12 +12 @@
   Font.Height = -30
   Font.Name = 'MS Sans Serif'
-  OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy

trunk/Back.pas

@@ -18 +18 @@
     procedure FormShow(Sender: TObject);
     procedure FormCreate(Sender: TObject);
-    procedure FormClose(Sender: TObject; var Action: TCloseAction);
   private
     Img: TBitmap;
@@ -54 +53 @@
 begin
   if Assigned(Img) then
-    BitBltCanvas(Canvas, Screen.Width - Img.Width - (Screen.Width - 800) *
-      3 div 8, (Screen.Height - 600) div 3, Img.Width, Img.Height,
+    BitBltCanvas(Canvas, Screen.PrimaryMonitor.Width - Img.Width - (Screen.PrimaryMonitor.Width - 800) *
+      3 div 8, (Screen.PrimaryMonitor.Height - 600) div 3, Img.Width, Img.Height,
       Img.Canvas, 0, 0);
-end;
-
-procedure TBackground.FormClose(Sender: TObject; var Action: TCloseAction);
-begin
 end;
 
@@ -68 +63 @@
 begin
   if FullScreen then begin
+    BoundsRect := Screen.PrimaryMonitor.BoundsRect;
     WindowState := TWindowState.wsFullScreen;
     if not Assigned(Img) then begin

trunk/Inp.pas

@@ -89 +89 @@
   EditInput.SelLength := Length(EditInput.Text);
   if Center then
-    CenterToRect(Rect(0, 0, Screen.Width, Screen.Height));
+    CenterToRect(Screen.PrimaryMonitor.BoundsRect);
   Gtk2DisableControlStyling(EditInput);
 end;

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;
 

trunk/NoTerm.pas

@@ -87 +87 @@
 procedure TNoTermDlg.FormCreate(Sender: TObject);
 begin
-  Left := Screen.Width - Width - 8;
-  Top := 8;
+  BoundsRect := Bounds(Screen.PrimaryMonitor.Left + Screen.PrimaryMonitor.Width - Width - 8,
+    8, Width, Height);
   Caption := Phrases.Lookup('AIT');
   Canvas.Brush.Style := TBrushStyle.bsClear;

trunk/Packages/CevoComponents/BaseWin.pas

@@ -103 +103 @@
   TitleHeight := WideFrame;
   ModalFrameIndent := 45;
-  UserLeft := (Screen.Width - Width) div 2;
-  UserTop := (Screen.Height - Height) div 2;
+  UserLeft := Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - Width) div 2;
+  UserTop := Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - Height) div 2;
 end;
 

trunk/Packages/CevoComponents/DrawDlg.pas

@@ -35 +35 @@
     destructor Destroy; override;
     procedure SmartInvalidate; virtual;
+    procedure CenterToScreen; overload;
+    procedure CenterToScreen(AWidth, AHeight: Integer); overload;
   end;
 
@@ -210 +212 @@
 end;
 
+procedure TDrawDlg.CenterToScreen;
+begin
+  BoundsRect := Bounds(
+    Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - Width) div 2,
+    Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - Height) div 2,
+    Width, Height);
+end;
+
+procedure TDrawDlg.CenterToScreen(AWidth, AHeight: Integer);
+begin
+  BoundsRect := Bounds(
+    Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - AWidth) div 2,
+    Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - AHeight) div 2,
+    Width, Height);
+end;
+
 { TBaseMessgDlg }
 
 procedure TBaseMessgDlg.FormCreate(Sender: TObject);
 begin
-  Left := (Screen.Width - Width) div 2;
+  Left := Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - Width) div 2;
   Canvas.Font.Assign(UniFont[ftNormal]);
   Canvas.Brush.Style := TBrushStyle.bsClear;
   MessgText := '';
   TopSpace := 0;
-  TitleHeight := Screen.Height;
+  TitleHeight := Screen.PrimaryMonitor.Height;
   if csDesigning in ComponentState then Exit;
   InitButtons;
@@ -287 +305 @@
 var
   I: Integer;
-begin
-  Height := 72 + Border + TopSpace + Lines * MessageLineSpacing;
-  Top := (Screen.Height - Height) div 2;
-  for i := 0 to ControlCount - 1 do
-    Controls[i].Top := Height - (34 + Border);
+  NewHeight: Integer;
+  NewTop: Integer;
+begin
+  NewHeight := 72 + Border + TopSpace + Lines * MessageLineSpacing;
+  NewTop := Screen.PrimaryMonitor.Top + (Screen.PrimaryMonitor.Height - NewHeight) div 2;
+  BoundsRect := Bounds(Left, NewTop, Width, NewHeight);
+  for I := 0 to ControlCount - 1 do
+    Controls[I].Top := NewHeight - (34 + Border);
 end;
 

trunk/Packages/DpiControls/Dpi.Forms.pas

@@ -202 +202 @@
   end;
 
+  { TMonitor }
+
+  TMonitor = class
+  private
+    function GetLeft: Integer;
+    function GetHeight: Integer;
+    function GetTop: Integer;
+    function GetWidth: Integer;
+    function GetBoundsRect: TRect;
+  public
+    NativeMonitor: Forms.TMonitor;
+    property Left: Integer read GetLeft;
+    property Height: Integer read GetHeight;
+    property Top: Integer read GetTop;
+    property Width: Integer read GetWidth;
+    property BoundsRect: TRect read GetBoundsRect;
+  end;
+
   { TScreen }
 
@@ -209 +227 @@
     FActiveForm: TForm;
     FPrevActiveForms: TForms;
+    FPrimaryMonitor: TMonitor;
     FForms: TForms;
     procedure AddForm(AForm: TForm);
@@ -215 +234 @@
     function GetDesktopTop: Integer;
     function GetDesktopWidth: Integer;
+    function GetPrimaryMonitor: TMonitor;
     procedure RemoveForm(AForm: TForm);
     function GetActiveForm: TForm;
@@ -248 +268 @@
     property DesktopWidth: Integer read GetDesktopWidth;
     property DesktopHeight: Integer read GetDesktopHeight;
+    property PrimaryMonitor: TMonitor read GetPrimaryMonitor;
   end;
 
@@ -477 +498 @@
 begin
   Result := Application.MessageBox(Text, Caption, Flags);
+end;
+
+{ TMonitor }
+
+function TMonitor.GetLeft: Integer;
+begin
+  Result := ScaleFromNative(NativeMonitor.Left);
+end;
+
+function TMonitor.GetHeight: Integer;
+begin
+  Result := ScaleFromNative(NativeMonitor.Height);
+end;
+
+function TMonitor.GetTop: Integer;
+begin
+  Result := ScaleFromNative(NativeMonitor.Top);
+end;
+
+function TMonitor.GetWidth: Integer;
+begin
+  Result := ScaleFromNative(NativeMonitor.Width);
+end;
+
+function TMonitor.GetBoundsRect: TRect;
+begin
+  Result := ScaleRectFromNative(NativeMonitor.BoundsRect);
 end;
 
@@ -944 +992 @@
 end;
 
+function TScreen.GetPrimaryMonitor: TMonitor;
+begin
+  if not Assigned(FPrimaryMonitor) then begin
+    FPrimaryMonitor := TMonitor.Create;
+    FPrimaryMonitor.NativeMonitor := LCLScreen.PrimaryMonitor;
+  end;
+  Result := FPrimaryMonitor;
+end;
+
 procedure TScreen.RemoveForm(AForm: TForm);
 begin
@@ -1006 +1063 @@
   FreeAndNil(FForms);
   FreeAndNil(FPrevActiveForms);
+  if Assigned(FPrimaryMonitor) then
+    FreeAndNil(FPrimaryMonitor);
   inherited;
 end;

trunk/Start.pas

@@ -252 +252 @@
     end; // default AI not found, use any
 
-  DirectDlg.Left := (Screen.Width - DirectDlg.Width) div 2;
-  DirectDlg.Top := (Screen.Height - DirectDlg.Height) div 2;
+  DirectDlg.CenterToScreen;
 
   UpdateInterface;
@@ -509 +508 @@
 begin
   if FullScreen then begin
-    Location := Point((Screen.Width - 800) * 3 div 8,
-      Screen.Height - Height - (Screen.Height - 600) div 3);
+    Location := Point(Screen.PrimaryMonitor.Left + (Screen.PrimaryMonitor.Width - 800) * 3 div 8,
+      Screen.PrimaryMonitor.Top + Screen.PrimaryMonitor.Height - Height - (Screen.PrimaryMonitor.Height - 600) div 3);
     BoundsRect := Bounds(Location.X, Location.Y, Width, Height);
 
@@ -524 +523 @@
     DeleteObject(r0); // causes crash with Windows 95
   end else begin
-    BoundsRect := Bounds((Screen.Width - Width) div 2,
-      (Screen.Height - Height) div 2, Width, Height);
+    CenterToScreen;
   end;
 end;