Changeset 102 for trunk/Game.pas

Timestamp:

Dec 9, 2024, 11:55:53 AM (13 days ago)

Author:

chronos

Message:

• Modified: Lowered minimal swipe distance.
• Modified: Show score and best score as boxes. Place them according window size.
• Modified: Updated Common package.

File:

• trunk/Game.pas (modified) (5 diffs)

trunk/Game.pas

@@ -119 +119 @@
     procedure DoPaint;
     procedure RenderTile(Canvas: TCanvas; Tile: TTile; TileRect: TRect; WithText: Boolean);
+    procedure RenderControls(Canvas: TCanvas; Rect: TRect; Horizontal: Boolean);
+    function RenderTextBox(Canvas: TCanvas; Pos: TPoint; Title, Value: string): TSize;
     procedure GameOver;
     procedure SetColorPalette(AValue: TColorPalette);
@@ -185 +187 @@
 resourcestring
   SScore = 'Score';
-  STopScore = 'Top score';
+  STopScore = 'Best';
   SSkinLinear = 'Linear';
   SSkinPowerOfTwo = 'Power of two';
@@ -643 +645 @@
   X, Y: Integer;
   TileSize: TPoint;
-  ValueStr: string;
   Frame: TRect;
   TileRect: TRect;
   TopBarHeight: Integer;
+  LeftBarWidth: Integer;
   TileMargin: Integer;
   TileCenter: TPoint;
@@ -652 +654 @@
   MetaCanvas: TMetaCanvas;
   BorderSize: Integer;
-begin
+  ControlsRect: TRect;
+  BoardRect: TRect;
+  Horizontal: Boolean;
+begin
+  // Form.Canvas.Width and Form.Canvas.Height is not working correctly under Windows.
+  // So dimensions are provided by CanvasSize parameter.
+
   MetaCanvas := TMetaCanvas.Create;
   MetaCanvas.Size := Point(Canvas.Width, Canvas.Height);
 
-  TopBarHeight := ScaleY(24, 96);
+  // Clear background
   MetaCanvas.Brush.Style := bsSolid;
   MetaCanvas.Brush.Color := Core.Core.ThemeManager1.Theme.ColorControl;
   MetaCanvas.FillRect(0, 0, MetaCanvas.Width, MetaCanvas.Height);
 
-  ValueStr := SScore + ': ' + IntToStr(Score);
-  MetaCanvas.Brush.Style := bsClear;
-  MetaCanvas.Font.Color := Core.Core.ThemeManager1.Theme.ColorControlText;
-  MetaCanvas.Font.Height := Trunc(TopBarHeight * 0.7);
-  MetaCanvas.TextOut(ScaleY(16, 96), (TopBarHeight - MetaCanvas.TextHeight(ValueStr)) div 2, ValueStr);
-
-  ValueStr := STopScore + ': ' + IntToStr(TopScore);
-  MetaCanvas.Font.Color := Core.Core.ThemeManager1.Theme.ColorControlText;
-  MetaCanvas.Font.Height := Trunc(TopBarHeight * 0.7);
-  MetaCanvas.TextOut(ScaleY(136, 96), (TopBarHeight - MetaCanvas.TextHeight(ValueStr)) div 2, ValueStr);
-
-  // Form.Canvas.Width and Form.Canvas.Height is not working correctly under Windows.
-  // So dimensions are provided by CanvasSize parameter.
+  TopBarHeight := ScaleY(55, 96);
+  LeftBarWidth := ScaleY(90, 96);
+  if CanvasSize.X - LeftBarWidth < Canvas.Height then begin
+    ControlsRect := Rect(0, 0, CanvasSize.X, TopBarHeight);
+    BoardRect := Rect(0, TopBarHeight, CanvasSize.X, CanvasSize.Y);
+    Horizontal := True;
+  end else begin
+    ControlsRect := Rect(0, 0, LeftBarWidth, CanvasSize.Y);
+    BoardRect := Rect(LeftBarWidth, 0, CanvasSize.X, CanvasSize.Y);
+    Horizontal := False;
+  end;
+
+  RenderControls(MetaCanvas, ControlsRect, Horizontal);
+
   BorderSize := ScaleY(2, 96);
-  Frame := Rect(BorderSize, BorderSize + TopBarHeight, CanvasSize.X - BorderSize, CanvasSize.Y - BorderSize);
+  Frame := Rect(BoardRect.Left + BorderSize, BoardRect.Top + BorderSize,
+    BoardRect.Right - BorderSize, BoardRect.Bottom - 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;
@@ -849 +860 @@
 end;
 
+procedure TGame.RenderControls(Canvas: TCanvas; Rect: TRect; Horizontal: Boolean);
+var
+  Pos: TPoint;
+  Size: TSize;
+begin
+  if Horizontal then Pos := Point(ScaleY(16, 96), ScaleY(4, 96))
+    else Pos := Point(ScaleY(4, 96), ScaleY(16, 96));
+
+  Size := RenderTextBox(Canvas, Pos, SScore, IntToStr(Score));
+
+  if Horizontal then Pos := Point(ScaleY(16 + 16, 96) + Size.Width, ScaleY(4, 96))
+    else Pos := Point(ScaleY(4, 96), ScaleY(16 + 16, 96) + Size.Height);
+
+  Size := RenderTextBox(Canvas, Pos, STopScore, IntToStr(TopScore));
+end;
+
+function TGame.RenderTextBox(Canvas: TCanvas; Pos: TPoint; Title, Value: string
+  ): TSize;
+var
+  BoxSize: TSize;
+begin
+  with Canvas do begin
+    Font.Color := Core.Core.ThemeManager1.Theme.ColorControlText;
+    Font.Height := Trunc(24);
+
+    BoxSize := Size(TextWidth(Title), TextHeight(Title) + TextHeight(Value));
+    if BoxSize.Width < TextWidth(Value) then BoxSize.Width := TextWidth(Value);
+    BoxSize := Size(Round(BoxSize.Width * 1.2), Round(BoxSize.Height * 1));
+
+    Brush.Style := bsSolid;
+    Brush.Color := Core.Core.ThemeManager1.Theme.ColorWindow;
+    FillRect(Pos.X, Pos.Y, Pos.X + BoxSize.Width, Pos.Y + BoxSize.Height);
+
+    Brush.Style := bsClear;
+    TextOut(Pos.X + (BoxSize.Width - TextWidth(Title)) div 2, Pos.Y, Title);
+
+    Brush.Style := bsClear;
+    Font.Color := Core.Core.ThemeManager1.Theme.ColorControlText;
+    Font.Height := Trunc(24);
+    TextOut(Pos.X + (BoxSize.Width - TextWidth(Value)) div 2,
+      Pos.Y + TextHeight(Title), Value);
+  end;
+
+  Result := BoxSize;
+end;
+
 function TGame.CanUndo: Boolean;
 begin