Changeset 68 for trunk

Timestamp:

Nov 28, 2020, 12:17:21 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Canvas width and height is not updated correctly on Windows. Use additional CanvasSize parameter in drawing methods.
• Fixed: Fullscreen was not working on Windows. Form border was not hidden.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (3 diffs)
• Packages/Common/UPersistentForm.pas (modified) (2 diffs)
• UEngine.pas (modified) (12 diffs)
• UMenu.pas (modified) (3 diffs)

trunk/Forms/UFormMain.pas

@@ -75 +75 @@
   if not Initialized then begin
     Initialized := True;
+    PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
+    PersistentForm1.Load(Self, False, True);
+    FullScreen := PersistentForm1.FormFullScreen;
+    Randomize;
+    Engine.InitMenus;
+    Engine.ImagePassenger.Picture.Assign(FormImages.ImagePassenger.Picture);
+    Engine.ImageLocomotive.Picture.Assign(FormImages.ImageLocomotive.Picture);
+    Engine.Map.Size := Point(PaintBox1.Width, PaintBox1.Height);
+    Engine.View.DestRect := Rect(0, 0, PaintBox1.Width, PaintBox1.Height);
+    Engine.MainMenu;
   end;
 end;
@@ -111 +121 @@
 procedure TFormMain.FormShow(Sender: TObject);
 begin
-  PersistentForm1.RegistryContext := ApplicationInfo1.GetRegistryContext;
-  PersistentForm1.Load(Self, False, True);
-  FullScreen := PersistentForm1.FormFullScreen;
-  Randomize;
-  Engine.InitMenus;
-  Engine.ImagePassenger.Picture.Assign(FormImages.ImagePassenger.Picture);
-  Engine.ImageLocomotive.Picture.Assign(FormImages.ImageLocomotive.Picture);
-  Engine.Map.Size := Point(PaintBox1.Width, PaintBox1.Height);
-  Engine.View.DestRect := Rect(0, 0, PaintBox1.Width, PaintBox1.Height);
-  Engine.MainMenu;
 end;
 
@@ -156 +156 @@
 begin
   Engine.View.DestRect := Rect(0, 0, PaintBox1.Width, PaintBox1.Height);
-  Engine.Paint(PaintBox1.Canvas);
+  Engine.Paint(PaintBox1.Canvas, Point(PaintBox1.Width, PaintBox1.Height));
 end;
 

trunk/Packages/Common/UPersistentForm.pas

@@ -317 +317 @@
       Form.RestoredHeight);
     ShowWindow(Form.Handle, SW_SHOWFULLSCREEN);
+    {$IFDEF WINDOWS}
+    Form.BorderStyle := bsNone;
+    {$ENDIF}
   end else begin
     FormFullScreen := False;
@@ -323 +326 @@
       //Form.BoundsRect := FormRestoredSize;
     end else if Form.WindowState = wsMaximized then ShowWindow(Form.Handle, SW_SHOWMAXIMIZED);
+    {$IFDEF WINDOWS}
+    Form.BorderStyle := bsSizeable;
+    {$ENDIF}
   end;
 end;

trunk/UEngine.pas

@@ -303 +303 @@
     procedure DrawShape(Canvas: TCanvas; Position: TPoint; Shape: TStationShape;
       Size: Integer; Angle: Double);
-    procedure DrawClock(Canvas: TCanvas);
+    procedure DrawClock(Canvas: TCanvas; CanvasSize: TPoint);
     procedure DrawTrains(Canvas: TCanvas);
-    procedure DrawGameOver(Canvas: TCanvas);
+    procedure DrawGameOver(Canvas: TCanvas; CanvasSize: TPoint);
     procedure DrawStationPassengerOverload(Canvas: TCanvas);
     procedure DrawLines(Canvas: TCanvas);
     procedure DrawStations(Canvas: TCanvas);
-    procedure DrawGameControls(Canvas: TCanvas);
+    procedure DrawGameControls(Canvas: TCanvas; CanvasSize: TPoint);
     procedure ComputeShapeDistance;
     procedure ComputeShapeDistanceStation(Station: TMapStation;
@@ -361 +361 @@
     destructor Destroy; override;
     procedure Tick;
-    procedure Paint(Canvas: TCanvas);
+    procedure Paint(Canvas: TCanvas; CanvasSize: TPoint);
     property Time: TDateTime read FTime;
     property DarkMode: Boolean read FDarkMode write SetDarkMode;
@@ -2090 +2090 @@
 end;
 
-procedure TEngine.DrawClock(Canvas: TCanvas);
+procedure TEngine.DrawClock(Canvas: TCanvas; CanvasSize: TPoint);
 var
   ClockCenter: TPoint;
@@ -2103 +2103 @@
   Canvas.Pen.Color := Colors.Text;
   Canvas.Pen.Width := 2;
-  ClockCenter := Point(Canvas.Width - 30, 40);
+  ClockCenter := Point(CanvasSize.X - 30, 40);
   Angle := Time / (12 * OneHour) * 2 * Pi - Pi / 2;
   Canvas.EllipseC(ClockCenter.X, ClockCenter.Y, ClockSize, ClockSize);
@@ -2166 +2166 @@
 end;
 
-procedure TEngine.DrawGameOver(Canvas: TCanvas);
+procedure TEngine.DrawGameOver(Canvas: TCanvas; CanvasSize: TPoint);
 var
   Y: Integer;
@@ -2178 +2178 @@
     Y := 100;
     Font.Size := 40;
-    TextOut((Width - TextWidth(SGameOver)) div 2, Y, SGameOver);
+    TextOut((CanvasSize.X - TextWidth(SGameOver)) div 2, Y, SGameOver);
     Y := Y + Round(TextHeight(SGameOver) * 1.1);
 
     Font.Size := 14;
-    TextOut((Width - TextWidth(SGameOverReason)) div 2, Y, SGameOverReason);
+    TextOut((CanvasSize.X - TextWidth(SGameOverReason)) div 2, Y, SGameOverReason);
     Y := Y + Round(TextHeight(SGameOverReason) * 1.1);
 
     Text := Format(SGameOverStatistic, [ServedPassengerCount, ServedDaysCount]);
-    TextOut((Width - TextWidth(Text)) div 2, Y, Text);
+    TextOut((CanvasSize.X - TextWidth(Text)) div 2, Y, Text);
     Y := Y + Round(TextHeight(SGameOverStatistic) * 1.1);
 
@@ -2199 +2199 @@
     Text := Text + Format(SOldHighScore, [HighestServedPassengerCount,
       HighestServedDaysCount]);
-    Canvas.TextOut((Canvas.Width - Canvas.TextWidth(Text)) div 2, Y, Text);
+    Canvas.TextOut((CanvasSize.X - TextWidth(Text)) div 2, Y, Text);
     Y := Y + Round(TextHeight(Text) * 1.1);
     if (ServedPassengerCount > HighestServedPassengerCount) then
@@ -2363 +2363 @@
 end;
 
-procedure TEngine.DrawGameControls(Canvas: TCanvas);
+procedure TEngine.DrawGameControls(Canvas: TCanvas; CanvasSize: TPoint);
 var
   I: Integer;
@@ -2388 +2388 @@
     end;
 
-    Canvas.EllipseC(Canvas.Width div 2 - Length(LineColors) div 2 * LineColorsDist + I * LineColorsDist,
-      Canvas.Height - LineColorsDist, Radius, Radius);
+    Canvas.EllipseC(CanvasSize.X div 2 - Length(LineColors) div 2 * LineColorsDist + I * LineColorsDist,
+      CanvasSize.Y - LineColorsDist, Radius, Radius);
   end;
 
   // Draw unused trains
   Text := IntToStr(Trains.GetUnusedCount);
-  Canvas.Draw(Canvas.Width div 2 - Length(LineColors) div 2 * LineColorsDist - 100,
-    Canvas.Height - LineColorsDist - ImageLocomotive.Picture.Bitmap.Height div 2, ImageLocomotive.Picture.Bitmap);
+  Canvas.Draw(CanvasSize.X div 2 - Length(LineColors) div 2 * LineColorsDist - 100,
+    CanvasSize.Y - LineColorsDist - ImageLocomotive.Picture.Bitmap.Height div 2, ImageLocomotive.Picture.Bitmap);
   Canvas.Brush.Style := bsClear;
   Canvas.Font.Size := 14;
   Canvas.Font.Color := Colors.Text;
-  Canvas.TextOut(Canvas.Width div 2 - Length(LineColors) div 2 * LineColorsDist - 50 - Canvas.TextWidth(Text),
-    Canvas.Height - LineColorsDist - Canvas.TextHeight(Text) div 2, Text);
+  Canvas.TextOut(CanvasSize.X div 2 - Length(LineColors) div 2 * LineColorsDist - 50 - Canvas.TextWidth(Text),
+    CanvasSize.Y - LineColorsDist - Canvas.TextHeight(Text) div 2, Text);
 
   // Status interface
   Text := IntToStr(ServedPassengerCount);
-  Canvas.Draw(Canvas.Width - 50, Canvas.Height - 60, ImagePassenger.Picture.Bitmap);
+  Canvas.Draw(CanvasSize.X - 50, CanvasSize.Y - 60, ImagePassenger.Picture.Bitmap);
   Canvas.Brush.Style := bsClear;
   Canvas.Font.Size := 14;
   Canvas.Font.Color := Colors.Text;
-  Canvas.TextOut(Canvas.Width - 70 - Canvas.TextWidth(Text), Canvas.Height - 55, Text);
-
-  DrawClock(Canvas);
+  Canvas.TextOut(CanvasSize.X - 70 - Canvas.TextWidth(Text),
+    CanvasSize.Y - 55, Text);
+
+  DrawClock(Canvas, CanvasSize);
 
   // Back button
@@ -2838 +2839 @@
 end;
 
-procedure TEngine.Paint(Canvas: TCanvas);
+procedure TEngine.Paint(Canvas: TCanvas; CanvasSize: TPoint);
 begin
   MetaCanvas.Size := Point(Canvas.Width, Canvas.Height);
@@ -2860 +2861 @@
 
   if State <> gsMenu then begin
-    DrawGameControls(Canvas);
+    DrawGameControls(Canvas, CanvasSize);
   end;
 
@@ -2866 +2867 @@
   if State = gsGameOver then
   begin
-    DrawGameOver(Canvas);
+    DrawGameOver(Canvas, CanvasSize);
   end else
   if State = gsMenu then begin
-    Menu.Paint(Canvas);
+    Menu.Paint(Canvas, CanvasSize);
   end;
 

trunk/UMenu.pas

@@ -81 +81 @@
     procedure MouseMove(Position: TPoint);
     procedure MouseUp(Button: TMouseButton; Position: TPoint);
-    procedure Paint(Canvas: TCanvas);
+    procedure Paint(Canvas: TCanvas; CanvasSize: TPoint);
     constructor Create;
     destructor Destroy; override;
@@ -216 +216 @@
 end;
 
-procedure TMenu.Paint(Canvas: TCanvas);
+procedure TMenu.Paint(Canvas: TCanvas; CanvasSize: TPoint);
 var
   I: Integer;
@@ -240 +240 @@
     end;
 
-    X := (Width - TotalWidth) div 2;
-    Y := (Height - TotalHeight) div 2;
+    X := (CanvasSize.X - TotalWidth) div 2;
+    Y := (CanvasSize.Y - TotalHeight) div 2;
 
     // Menu items