Changeset 100 for trunk

Timestamp:

Dec 9, 2024, 9:41:19 AM (5 weeks ago)

Author:

chronos

Message:

• Fixed: Board size calculation inside the main window.

Location:

trunk

Files:

• Forms/FormMain.pas (modified) (1 diff)
• Game.pas (modified) (2 diffs)

trunk/Forms/FormMain.pas

@@ -165 +165 @@
   TimeStart := Now;
   {$ENDIF}
-  Core.Core.Game.Render(Canvas, Point(Width, Height - MainMenu1.Height));
+  Core.Core.Game.Render(Canvas, Point(Width, Height));
   {$IFDEF DEBUG}
   DrawDuration := Now - TimeStart;

trunk/Game.pas

@@ -651 +651 @@
   S: TPoint;
   MetaCanvas: TMetaCanvas;
+  BorderSize: Integer;
 begin
   MetaCanvas := TMetaCanvas.Create;
@@ -673 +674 @@
   // Form.Canvas.Width and Form.Canvas.Height is not working correctly under Windows.
   // So dimensions are provided by CanvasSize parameter.
-  Frame := Rect(2, TopBarHeight, CanvasSize.X - 2, CanvasSize.Y - 2);
+  BorderSize := ScaleY(2, 96);
+  Frame := Rect(BorderSize, BorderSize + TopBarHeight, CanvasSize.X - BorderSize, CanvasSize.Y - BorderSize);
   TileSize := Point(Frame.Width div Board.Size.X, Frame.Height div Board.Size.Y);
   if TileSize.X < TileSize.Y then TileSize.Y := TileSize.X;
   if TileSize.Y < TileSize.X then TileSize.X := TileSize.Y;
-  Frame := Rect(Frame.Width div 2 - (Board.Size.X * TileSize.X) div 2,
+  Frame := Rect(Frame.Left + Frame.Width div 2 - (Board.Size.X * TileSize.X) div 2,
     Frame.Top + Frame.Height div 2 - (Board.Size.Y * TileSize.Y) div 2,
-    Frame.Width div 2 + (Board.Size.X * TileSize.X) div 2,
+    Frame.Left + Frame.Width div 2 + (Board.Size.X * TileSize.X) div 2,
     Frame.Top + Frame.Height div 2 + (Board.Size.Y * TileSize.Y) div 2);