Changeset 505 for trunk/Packages

Timestamp:

Dec 24, 2023, 11:24:57 PM (11 months ago)

Author:

chronos

Message:

• Modified: Code cleanup.

Location:

trunk/Packages/CevoComponents

Files:

• ButtonN.pas (modified) (1 diff)
• ScreenTools.pas (modified) (11 diffs)

trunk/Packages/CevoComponents/ButtonN.pas

@@ -36 +36 @@
 
 procedure Register;
+
 
 implementation

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -32 +32 @@
 function LoadGraphicFile(Bmp: TBitmap; FileName: string; Options: TLoadGraphicFileOptions = []): Boolean;
 function LoadGraphicSet(const Name: string; Transparency: Boolean = True): TGraphicSet;
-procedure Dump(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
+procedure Dump(Dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
 procedure BitmapReplaceColor(Dst: TBitmap; X, Y, Width, Height: Integer; OldColor, NewColor: TColor);
 procedure Sprite(Canvas: TCanvas; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
   overload;
-procedure Sprite(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
+procedure Sprite(Canvas: TCanvas; xDst, yDst: Integer; GraphicSetItem: TGraphicSetItem);
+  overload;
+procedure Sprite(Dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
   overload;
 procedure MakeBlue(Dst: TBitmap; X, Y, Width, Height: Integer);
@@ -85 +87 @@
 procedure VDarkGradient(Canvas: TCanvas; X, Y, Height, Kind: Integer);
 procedure UnderlinedTitleValue(Canvas: TCanvas; Title, Value: string; X, Y, Width: Integer);
-procedure NumberBar(dst: TBitmap; X, Y: Integer; Cap: string; val: Integer;
+procedure NumberBar(Dst: TBitmap; X, Y: Integer; Cap: string; val: Integer;
   T: TTexture);
-procedure CountBar(dst: TBitmap; X, Y, W: Integer; Kind: Integer;
+procedure CountBar(Dst: TBitmap; X, Y, W: Integer; Kind: Integer;
   Cap: string; val: Integer; T: TTexture);
 procedure PaintProgressBar(Canvas: TCanvas; Kind, X, Y, Pos, Growth, Max: Integer;
@@ -562 +564 @@
 end;
 
-procedure Dump(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
-begin
-  BitBltCanvas(dst.Canvas, xDst, yDst, Width, Height,
+procedure Dump(Dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
+begin
+  BitBltCanvas(Dst.Canvas, xDst, yDst, Width, Height,
     HGr.Data.Canvas, xGr, yGr);
 end;
@@ -863 +865 @@
 procedure Sprite(Canvas: TCanvas; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
 begin
-  BitBltCanvas(Canvas, xDst, yDst, Width, Height,
-    HGr.Mask.Canvas, xGr, yGr, SRCAND);
-  BitBltCanvas(Canvas, xDst, yDst, Width, Height,
-    HGr.Data.Canvas, xGr, yGr, SRCPAINT);
-end;
-
-procedure Sprite(dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
-begin
-  BitBltCanvas(dst.Canvas, xDst, yDst, Width, Height,
-    HGr.Mask.Canvas, xGr, yGr, SRCAND);
-  BitBltCanvas(dst.Canvas, xDst, yDst, Width, Height,
-    HGr.Data.Canvas, xGr, yGr, SRCPAINT);
+  BitBltCanvas(Canvas, xDst, yDst, Width, Height, HGr.Mask.Canvas, xGr, yGr, SRCAND);
+  BitBltCanvas(Canvas, xDst, yDst, Width, Height, HGr.Data.Canvas, xGr, yGr, SRCPAINT);
+end;
+
+procedure Sprite(Canvas: TCanvas; xDst, yDst: Integer; GraphicSetItem: TGraphicSetItem);
+begin
+  Sprite(Canvas, GraphicSetItem.GraphicSet, xDst, yDst, GraphicSetItem.Width,
+    GraphicSetItem.Height, GraphicSetItem.Left, GraphicSetItem.Top);
+end;
+
+procedure Sprite(Dst: TBitmap; HGr: TGraphicSet; xDst, yDst, Width, Height, xGr, yGr: Integer);
+begin
+  Sprite(Dst.Canvas, HGr, xDst, yDst, Width, Height, xGr, yGr);
 end;
 
@@ -1211 +1214 @@
   procedure PaintIcon(X, Y, Kind: Integer);
   begin
-    BitBltCanvas(Canvas, X, Y + 6, 10, 10, HGrSystem.Mask.Canvas,
-      66 + Kind mod 11 * 11, 115 + Kind div 11 * 11, SRCAND);
-    BitBltCanvas(Canvas, X, Y + 6, 10, 10, HGrSystem.Data.Canvas,
-      66 + Kind mod 11 * 11, 115 + Kind div 11 * 11, SRCPAINT);
+    Sprite(Canvas, HGrSystem, X, Y + 6, 10, 10,
+      66 + Kind mod 11 * 11, 115 + Kind div 11 * 11);
   end;
 
@@ -1383 +1384 @@
 end;
 
-procedure NumberBar(dst: TBitmap; X, Y: Integer; Cap: string;
+procedure NumberBar(Dst: TBitmap; X, Y: Integer; Cap: string;
   val: Integer; T: TTexture);
 var
@@ -1390 +1391 @@
   if val > 0 then
   begin
-    DLine(dst.Canvas, X - 2, X + 170, Y + 16, T.ColorBevelShade,
+    DLine(Dst.Canvas, X - 2, X + 170, Y + 16, T.ColorBevelShade,
       T.ColorBevelLight);
-    LoweredTextOut(dst.Canvas, -1, T, X - 2, Y, Cap);
+    LoweredTextOut(Dst.Canvas, -1, T, X - 2, Y, Cap);
     S := IntToStr(val);
-    RisedTextOut(dst.Canvas, X + 170 - BiColorTextWidth(dst.Canvas,
+    RisedTextOut(Dst.Canvas, X + 170 - BiColorTextWidth(Dst.Canvas,
       S), Y, S);
   end;
 end;
 
-procedure CountBar(dst: TBitmap; X, Y, W: Integer; Kind: Integer;
+procedure CountBar(Dst: TBitmap; X, Y, W: Integer; Kind: Integer;
   Cap: string; val: Integer; T: TTexture);
 var
@@ -1409 +1410 @@
     Exit;
   Assert(Kind >= 0);
-  with dst.Canvas do
+  with Dst.Canvas do
   begin
     // xIcon:=x+100;
     // yIcon:=y;
-    // DLine(dst.Canvas,x-2,x+170+32,y+16,T.ColorBevelShade,T.ColorBevelLight);
+    // DLine(Dst.Canvas,x-2,x+170+32,y+16,T.ColorBevelShade,T.ColorBevelLight);
 
     xIcon := X - 5;
     yIcon := Y + 15;
-    DLine(dst.Canvas, X - 2, xIcon + W + 2, yIcon + 16, T.ColorBevelShade,
+    DLine(Dst.Canvas, X - 2, xIcon + W + 2, yIcon + 16, T.ColorBevelShade,
       T.ColorBevelLight);
 
@@ -1425 +1426 @@
     else
       cl := -1;
-    LoweredTextOut(dst.Canvas, cl, T, X - 2, Y, Cap);
-    LoweredTextOut(dst.Canvas, cl, T,
-      xIcon + W + 2 - BiColorTextWidth(dst.Canvas, S), yIcon, S);
+    LoweredTextOut(Dst.Canvas, cl, T, X - 2, Y, Cap);
+    LoweredTextOut(Dst.Canvas, cl, T,
+      xIcon + W + 2 - BiColorTextWidth(Dst.Canvas, S), yIcon, S);
 
     if (Kind = 12) and (val >= 100) then
@@ -1441 +1442 @@
       for I := 0 to val mod 10 - 1 do
       begin
-        BitBltCanvas(dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 2 + 1, 14,
+        BitBltCanvas(Dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 2 + 1, 14,
           14, HGrSystem.Mask.Canvas, 67 + Kind mod 8 * 15,
           70 + Kind div 8 * 15, SRCAND);
-        Sprite(dst, HGrSystem, xIcon + 3 + I * (14 * ld div sd), yIcon + 2,
+        Sprite(Dst, HGrSystem, xIcon + 3 + I * (14 * ld div sd), yIcon + 2,
           14, 14, 67 + Kind mod 8 * 15, 70 + Kind div 8 * 15);
       end;
       for I := 0 to val div 10 - 1 do
       begin
-        BitBltCanvas(dst.Canvas, xIcon + 4 + (val mod 10) *
+        BitBltCanvas(Dst.Canvas, xIcon + 4 + (val mod 10) *
           (14 * ld div sd) + I * (14 * ld div sd), yIcon + 3, 14, 14,
           HGrSystem.Mask.Canvas, 67 + 7 mod 8 * 15,
           70 + 7 div 8 * 15, SRCAND);
-        Sprite(dst, HGrSystem, xIcon + 3 + (val mod 10) *
+        Sprite(Dst, HGrSystem, xIcon + 3 + (val mod 10) *
           (14 * ld div sd) + I * (14 * ld div sd), yIcon + 2, 14,
           14, 67 + 7 mod 8 * 15,
@@ -1474 +1475 @@
       for I := 0 to val div 10 - 1 do
       begin
-        BitBltCanvas(dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 3, 14, 14,
+        BitBltCanvas(Dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 3, 14, 14,
           HGrSystem.Mask.Canvas, 67 + Kind mod 8 * 15,
           70 + Kind div 8 * 15, SRCAND);
-        Sprite(dst, HGrSystem, xIcon + 3 + I * (14 * ld div sd), yIcon + 2,
+        Sprite(Dst, HGrSystem, xIcon + 3 + I * (14 * ld div sd), yIcon + 2,
           14, 14, 67 + Kind mod 8 * 15, 70 + Kind div 8 * 15);
       end;
       for I := 0 to val mod 10 - 1 do
       begin
-        BitBltCanvas(dst.Canvas, xIcon + 4 + (val div 10) *
+        BitBltCanvas(Dst.Canvas, xIcon + 4 + (val div 10) *
           (14 * ld div sd) + I * (10 * ld div sd), yIcon + 7, 10, 10,
           HGrSystem.Mask.Canvas, 66 + Kind mod 11 * 11,
           115 + Kind div 11 * 11, SRCAND);
-        Sprite(dst, HGrSystem, xIcon + 3 + (val div 10) *
+        Sprite(Dst, HGrSystem, xIcon + 3 + (val div 10) *
           (14 * ld div sd) + I * (10 * ld div sd), yIcon + 6, 10,
           10, 66 + Kind mod 11 * 11,