Changeset 60 for trunk/Packages/Kernel/Kernel.Graphics.pas

Timestamp:

Apr 7, 2024, 11:26:09 PM (6 weeks ago)

Author:

chronos

Message:

• Modified: Remove U prefix from unit names.

File:

• trunk/Packages/Kernel/Kernel.Graphics.pas (moved) (moved from trunk/Packages/Kernel/UGraphics.pas ) (12 diffs)

trunk/Packages/Kernel/Kernel.Graphics.pas

@@ -1 @@
-unit UGraphics;
-
-{$mode delphi}
+unit Kernel.Graphics;
 
 interface
 
 uses
-  SysUtils, fgl;
+  SysUtils, Generics.Collections;
 
 type
@@ -16 +14 @@
     X: Integer;
     Y: Integer;
-    function Create(X, Y: Integer): TPoint; inline;
+    class function Create(X, Y: Integer): TPoint; inline; static;
     function Add(P: TPoint): TPoint;
   end;
@@ -36 +34 @@
     Size: TPoint;
     function PointInside(P: TPoint): Boolean;
-    function Create(Left, Top, Width, Height: Integer): TRectangle; overload; inline;
-    function Create(Position, Size: TPoint): TRectangle; overload; inline;
+    class function Create(Left, Top, Width, Height: Integer): TRectangle; overload; inline; static;
+    class function Create(Position, Size: TPoint): TRectangle; overload; inline; static;
     function AddPoint(P: TPoint): TRectangle;
     property Left: Integer read GetLeft write SetLeft;
@@ -88 +86 @@
 
   TRaster = class(TGraphicObject)
-
   end;
 
   TFont = class(TGraphicObject)
-
   end;
 
@@ -102 +98 @@
     CanvasLastId: Integer;
   public
-    Objects: TFPGObjectList<TGraphicObject>;
-    Canvases: TFPGObjectList<TCanvas>;
+    Objects: TObjectList<TGraphicObject>;
+    Canvases: TObjectList<TCanvas>;
     ParentCanvas: TCanvas;
     function CreateWindow: TWindow;
@@ -114 +110 @@
   end;
 
+
 implementation
 
@@ -164 +161 @@
 end;
 
-function TRectangle.Create(Left, Top, Width, Height: Integer): TRectangle;
+class function TRectangle.Create(Left, Top, Width, Height: Integer): TRectangle;
 begin
   Result.Position.X := Left;
@@ -172 +169 @@
 end;
 
-function TRectangle.Create(Position, Size: TPoint): TRectangle;
+class function TRectangle.Create(Position, Size: TPoint): TRectangle;
 begin
   Result.Position := Position;
@@ -186 +183 @@
 { TPoint }
 
-function TPoint.Create(X, Y: Integer): TPoint;
+class function TPoint.Create(X, Y: Integer): TPoint;
 begin
   Result.X := X;
@@ -263 +260 @@
 destructor TWindow.Destroy;
 begin
-  inherited Destroy;
+  inherited;
 end;
 
@@ -317 +314 @@
 constructor TDesktop.Create;
 begin
-  Objects := TFPGObjectList<TGraphicObject>.Create;
-  Canvases := TFPGObjectList<TCanvas>.Create;
+  Objects := TObjectList<TGraphicObject>.Create;
+  Canvases := TObjectList<TCanvas>.Create;
 end;
 
@@ -325 +322 @@
   FreeAndNil(Canvases);
   FreeAndNil(Objects);
-  inherited Destroy;
+  inherited;
 end;