Changeset 219 for trunk

Timestamp:

May 11, 2020, 10:06:08 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Apply correctly fullscreen mode to MainScreen.

Location:

trunk

Files:

• Back.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (3 diffs)
• Start.pas (modified) (2 diffs)

trunk/Back.pas

@@ -75 +75 @@
   end else begin
     WindowState := wsNormal;
-    Width := StartDlg.Width + 16;
-    Height := StartDlg.Height + 16;
-    Left := StartDlg.Left - 8;
-    Top := StartDlg.Top - 8;
+    BoundsRect := Bounds(StartDlg.Left - 8, StartDlg.Top - 8,
+      StartDlg.Width + 16, StartDlg.Height + 16);
   end;
 end;

trunk/LocalPlayer/Term.pas

@@ -287 +287 @@
     Offscreen: TBitmap;
     OffscreenUser: TForm;
-    procedure CreateParams(var p: TCreateParams); override;
     procedure Client(Command, NewPlayer: integer; var Data);
     procedure SetAIName(p: integer; Name: string);
@@ -3398 +3397 @@
 
 { *** main part *** }
-
-procedure TMainScreen.CreateParams(var p: TCreateParams);
-begin
-  inherited;
-  if FullScreen then begin
-    p.Style := $87000000;
-    BorderStyle := bsNone;
-    BorderIcons := [];
-  end;
-end;
 
 procedure TMainScreen.FormCreate(Sender: TObject);
@@ -7805 +7794 @@
 procedure TMainScreen.FormShow(Sender: TObject);
 begin
-  Timer1.Enabled := true;
-  Left := 0;
-  Top := 0;
+  if FullScreen then begin
+    WindowState := wsMaximized;
+    BorderStyle := bsNone;
+    BorderIcons := [];
+  end else begin
+    WindowState := wsMaximized;
+    BorderStyle := bsSizeable;
+    BorderIcons := [biSystemMenu, biMinimize, biMaximize];
+  end;
+  Timer1.Enabled := True;
 end;
 

trunk/Start.pas

@@ -694 +694 @@
     Location := Point((Screen.Width - 800) * 3 div 8,
       Screen.Height - Height - (Screen.Height - 600) div 3);
-    Left := Location.X;
-    Top := Location.Y;
+    BoundsRect := Bounds(Location.X, Location.Y, Width, Height);
 
     r0 := CreateRectRgn(0, 0, Width, Height);
@@ -708 +707 @@
     DeleteObject(r0); // causes crash with Windows 95
   end else begin
-    Left := (Screen.Width - Width) div 2;
-    Top := (Screen.Height - Height) div 2;
+    BoundsRect := Bounds((Screen.Width - Width) div 2,
+      (Screen.Height - Height) div 2, Width, Height)
   end;
 end;