Changeset 622 for trunk/Packages

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/Packages

Files:

• CevoComponents/BaseWin.pas (modified) (1 diff)
• CevoComponents/DrawDlg.pas (modified) (3 diffs)
• DpiControls/Dpi.Forms.pas (modified) (7 diffs)

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;