Changeset 112

Timestamp:

Dec 10, 2024, 4:18:33 PM (11 days ago)

Author:

chronos

Message:

• Fixed: Scaling of tiles text.

Location:

trunk

Files:

• Game.pas (modified) (6 diffs)
• Packages/Common/MetaCanvas.pas (modified) (2 diffs)

trunk/Game.pas

@@ -125 +125 @@
   DirectionText: array[TMoveDirection] of string = ('None', 'Left', 'Up', 'Right', 'Down');
   InitialTileCount = 2;
-  BoxFontSize = 20;
+  BoxFontSize = 10;
 
 resourcestring
@@ -599 +599 @@
   ValueStr: string;
   TextSize: TSize;
-begin
+  CrossBorder: Integer;
+  FontHeightMultiplicator: Double;
+begin
+  // TODO: Why the fonts set with Height have different size across platforms?
+  {$IFDEF UNIX}
+  FontHeightMultiplicator := 72 / 96;
+  {$ELSE}
+  FontHeightMultiplicator := 1;
+  {$ENDIF}
+
   if Canvas.Brush.Style = bsClear then Exit;
 
   Canvas.Pen.Style := psClear;
   Canvas.RoundRect(TileRect, ScaleX(TileRect.Width div 20, 96), ScaleY(TileRect.Height div 20, 96));
+
+{  if Tile.Unmergeable then begin
+    CrossBorder := ScaleX(Trunc(TileRect.Width / 50), 96);
+    Canvas.Pen.Width := ScaleX(Trunc(TileRect.Width / 30), 96);
+    Canvas.Pen.Style := psSolid;
+    Canvas.Pen.Color := Canvas.Font.Color;
+    Canvas.Line(TileRect.Left + CrossBorder, TileRect.Top + CrossBorder,
+      TileRect.Right - CrossBorder, TileRect.Bottom - CrossBorder);
+    Canvas.Line(TileRect.Right - CrossBorder, TileRect.Top + CrossBorder,
+      TileRect.Left + CrossBorder, TileRect.Bottom - CrossBorder);
+  end;
+  }
+
   if WithText and (Tile.Value <> 0) then begin
     if Tile.Disabled then ValueStr := '@'
@@ -609 +631 @@
       else ValueStr := GetTileSkinValue(Tile.Value);
     Canvas.Brush.Style := bsClear;
-    Canvas.Font.Height := Trunc(TileRect.Height * 0.7);
+    Canvas.Font.Height := Trunc(TileRect.Height * FontHeightMultiplicator);
     TextSize := Canvas.TextExtent(ValueStr);
     if TextSize.Width > TileRect.Width then
@@ -642 +664 @@
   with Canvas do begin
     Font.Color := Core.Core.ThemeManager1.Theme.ColorControlText;
-    Font.Height := Trunc(ScaleX(BoxFontSize, 96));
+    Font.Size := Trunc(ScaleX(BoxFontSize, 96));
 
     BoxSize := Size(TextWidth(Title), TextHeight(Title) + TextHeight(Value));
@@ -657 +679 @@
     Brush.Style := bsClear;
     Font.Color := Core.Core.ThemeManager1.Theme.ColorControlText;
-    Font.Height := Trunc(ScaleX(BoxFontSize, 96));
+    Font.Size := Trunc(ScaleX(BoxFontSize, 96));
     TextOut(Pos.X + (BoxSize.Width - TextWidth(Value)) div 2,
       Pos.Y + TextHeight(Title), Value);
@@ -1015 +1037 @@
     end;
 
-    if RecordHistory then begin
+    if RecordHistory and Assigned(NewTile) then begin
       HistoryMove := THistoryMove.Create;
       HistoryMove.Direction := Direction;

trunk/Packages/Common/MetaCanvas.pas

@@ -150 +150 @@
     procedure SetWidth(AValue: Integer); override;
     function GetWidth: Integer; override;
-    procedure DoLine (x1,y1,x2,y2:integer); override;
+    procedure DoLine(X1, Y1, X2, Y2: Integer); override;
     procedure DoTextOut(X, Y: Integer; Text: string); override;
     procedure DoRectangle(const Bounds: TRect); override;
@@ -563 +563 @@
 end;
 
-procedure TMetaCanvas.DoLine(x1, y1, x2, y2: integer);
+procedure TMetaCanvas.DoLine(X1, Y1, X2, Y2: integer);
 var
   NewObj: TCanvasLine;