Changeset 79 for trunk/Packages/Common/UMetaCanvas.pas

Timestamp:

Feb 11, 2021, 11:20:18 PM (4 years ago)

Author:

chronos

Message:

• Added: Toggle full screen mode (F11) from View main menu.
• Modified: Updated Common package files.

File:

• trunk/Packages/Common/UMetaCanvas.pas (modified) (18 diffs)

trunk/Packages/Common/UMetaCanvas.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Graphics, Contnrs, Types;
+  Classes, SysUtils, Graphics, Contnrs, Types, fgl;
 
 type
@@ -17 +17 @@
     procedure Zoom(Factor: Double); virtual;
     procedure Move(Delta: TPoint); virtual;
+  end;
+
+  TCanvasObjects = class(TFPGObjectList<TCanvasObject>)
   end;
 
@@ -133 +136 @@
     procedure DoLineTo(X, Y: Integer); override;
   public
-    Objects: TObjectList;
+    Objects: TCanvasObjects;
     procedure FillRect(const ARect: TRect); overload; override;
     procedure FillRect(X1,Y1,X2,Y2: Integer); overload;
@@ -145 +148 @@
     procedure Pie(EllipseX1, EllipseY1, EllipseX2, EllipseY2,
       StartX, StartY, EndX, EndY: Integer); override;
-    procedure SetSize(Size: TPoint);
     procedure Reset;
     procedure DrawTo(Canvas: TCanvas);
@@ -152 +154 @@
     constructor Create;
     destructor Destroy; override;
-  end;
+    property Size: TPoint read FSize write FSize;
+  end;
+
 
 implementation
@@ -198 +202 @@
   Pen.Free;
   Brush.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -228 +232 @@
 destructor TCanvasStretchDraw.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
@@ -264 +268 @@
   Pen.Free;
   Brush.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -304 +308 @@
   Brush.Free;
   Pen.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -336 +340 @@
 begin
   Pen.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -375 +379 @@
   Pen.Free;
   Brush.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -408 +412 @@
   Brush.Free;
   Font.Free;
-  inherited Destroy;
+  inherited;
 end;
 
@@ -618 +622 @@
 end;
 
-procedure TMetaCanvas.SetSize(Size: TPoint);
-begin
-  FSize := Size;
-end;
-
 procedure TMetaCanvas.Reset;
 begin
@@ -633 +632 @@
 begin
   for I := 0 to Objects.Count - 1 do
-    TCanvasObject(Objects[I]).Paint(Canvas);
+    Objects[I].Paint(Canvas);
 end;
 
@@ -641 +640 @@
 begin
   for I := 0 to Objects.Count - 1 do
-    TCanvasObject(Objects[I]).Zoom(Factor);
+    Objects[I].Zoom(Factor);
 end;
 
@@ -649 +648 @@
 begin
   for I := 0 to Objects.Count - 1 do
-    TCanvasObject(Objects[I]).Move(Delta);
+    Objects[I].Move(Delta);
 end;
 
@@ -656 +655 @@
   inherited;
   FPenPos := Point(0, 0);
-  Objects := TObjectList.Create;
+  Objects := TCanvasObjects.Create;
 end;
 
@@ -662 +661 @@
 begin
   Objects.Free;
-  inherited Destroy;
+  inherited;
 end;