Changeset 115 for trunk/UGame.pas

Timestamp:

Dec 10, 2016, 3:52:26 PM (7 years ago)

Author:

chronos

Message:

• Fixed: In Debug mode also check executed classes references.
• Modified: Better About dialog.
• Modified: About and Help dialogs are created in time when they are shown.

File:

• trunk/UGame.pas (modified) (4 diffs)

trunk/UGame.pas

@@ -139 +139 @@
 
   TCanvasEx = class(TCanvas)
-    procedure TextOutEx(X,Y: Integer; const Text: string; MovePen: Boolean = True);
-    procedure PolygonEx(const Points: array of TPoint; Winding: Boolean);
+    class procedure TextOutEx(Canvas: TCanvas; X,Y: Integer; const Text: string; MovePen: Boolean = True);
+    class procedure PolygonEx(Canvas: TCanvas; const Points: array of TPoint; Winding: Boolean);
   end;
 
@@ -874 +874 @@
 { TCanvasEx }
 
-procedure TCanvasEx.TextOutEx(X, Y: Integer; const Text: string;
+class procedure TCanvasEx.TextOutEx(Canvas: TCanvas; X, Y: Integer; const Text: string;
   MovePen: Boolean);
 var
   Flags : Cardinal;
 begin
-  Changing;
-  RequiredState([csHandleValid, csFontValid, csBrushValid]);
-  Flags := 0;
-  if TextStyle.Opaque then
-    Flags := ETO_Opaque;
-  ExtUTF8Out(Handle, X, Y, Flags, nil, PChar(Text), Length(Text), nil);
-  if MovePen then MoveTo(X + TextWidth(Text), Y);
-  Changed;
-end;
-
-procedure TCanvasEx.PolygonEx(const Points: array of TPoint; Winding: Boolean);
+  with Canvas do begin
+    Changing;
+    RequiredState([csHandleValid, csFontValid, csBrushValid]);
+    Flags := 0;
+    if TextStyle.Opaque then
+      Flags := ETO_Opaque;
+    ExtUTF8Out(Handle, X, Y, Flags, nil, PChar(Text), Length(Text), nil);
+    if MovePen then MoveTo(X + TextWidth(Text), Y);
+    Changed;
+  end;
+end;
+
+class procedure TCanvasEx.PolygonEx(Canvas: TCanvas; const Points: array of TPoint; Winding: Boolean);
 begin
   //Changing;
   //RequiredState([csHandleValid, csBrushValid, csPenValid]);
-  LCLIntf.Polygon(Handle, @Points[0], Length(Points), Winding);
+  LCLIntf.Polygon(Canvas.Handle, @Points[0], Length(Points), Winding);
   //Changed;
 end;
@@ -1297 +1299 @@
     Brush.Style := bsSolid;
     //Polygon(Points, False, 0, Length(Points));
-    TCanvasEx(Canvas).PolygonEx(Points, False);
+    TCanvasEx.PolygonEx(Canvas, Points, False);
     //MoveTo(Points[0].X, Points[0].Y);
     //LineTo(Points[1].X, Points[1].Y);
@@ -1309 +1311 @@
       TextPos := View.CellToCanvasPos(Pos);
       TextSize := TextExtent(Text);
-      TCanvasEx(Canvas).TextOutEx(Round(TextPos.X) - TextSize.cx div 2,
+      TCanvasEx.TextOutEx(Canvas, Round(TextPos.X) - TextSize.cx div 2,
         Round(TextPos.Y) - TextSize.cy div 2, Text, False);
     end;