Changeset 78

Timestamp:

Nov 3, 2014, 8:04:02 PM (10 years ago)

Author:

chronos

Message:

• Modified: Determine cell text size at once instead width and height separately.

Location:

trunk

Files:

• Forms/UFormMain.pas (modified) (1 diff)
• UGame.pas (modified) (3 diffs)

trunk/Forms/UFormMain.pas

@@ -162 +162 @@
 begin
   if RedrawPending then begin
-    RedrawPending := False;
+    if not Core.DevelMode then RedrawPending := False;
     TimerPeriod := (9 * TimerPeriod + (Now - LastTimerTime)) / 10;
     LastTimerTime := Now;

trunk/UGame.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, ExtCtrls, Graphics, Contnrs, XMLConf, XMLRead, XMLWrite,
-  DOM, Math, FileUtil, UXMLUtils, Dialogs;
+  DOM, Math, FileUtil, UXMLUtils, Dialogs, Types;
 
 const
@@ -929 +929 @@
   TextPos: TPoint;
   Points: array of TPoint;
+  TextSize: TSize;
 begin
   with Canvas do begin
@@ -957 +958 @@
     Pen.Style := psSolid;
     Font.Color := clWhite;
+    Brush.Style := bsClear;
     Font.Size := Trunc(42 * View.Zoom);
     TextPos := View.CellToCanvasPos(Pos);
-    TextOut(Round(TextPos.X) - TextWidth(Text) div 2, Round(TextPos.Y) - TextHeight(Text) div 2, Text);
+    TextSize := TextExtent(Text);
+    TextOut(Round(TextPos.X) - TextSize.cx div 2, Round(TextPos.Y) - TextSize.cy div 2, Text);
   end;
 end;