Changeset 530 for trunk/Packages

Timestamp:

Feb 24, 2024, 8:04:26 PM (3 months ago)

Author:

chronos

Message:

• Modified: Use BitBltBitmap instead of BitBltCanvas if possible.

Location:

trunk/Packages/CevoComponents

Files:

• EOTButton.pas (modified) (3 diffs)
• ScreenTools.pas (modified) (7 diffs)

trunk/Packages/CevoComponents/EOTButton.pas

@@ -21 +21 @@
     destructor Destroy; override;
     procedure SetButtonIndexFast(X: Integer);
-    procedure SetBack(ca: TCanvas; X, Y: Integer);
+    procedure SetBack(Canvas: TCanvas; X, Y: Integer);
   private
     FTemplate: TBitmap;
@@ -77 +77 @@
     if FGraphic <> nil then begin
       UnshareBitmap(Buffer);
-      BitBltCanvas(Buffer.Canvas, 0, 0, 48, 48, Back.Canvas, 0, 0);
+      BitBltBitmap(Buffer, 0, 0, 48, 48, Back, 0, 0);
       ImageOp_CBC(Buffer, Template, 0, 0, 133, 149 + 48 * Byte(FDown), 48, 48,
         $000000, $FFFFFF);
@@ -109 +109 @@
 end;
 
-procedure TEOTButton.SetBack(ca: TCanvas; X, Y: Integer);
+procedure TEOTButton.SetBack(Canvas: TCanvas; X, Y: Integer);
 begin
-  BitBltCanvas(Back.Canvas, 0, 0, 48, 48, ca, X, Y);
+  BitBltCanvas(Back.Canvas, 0, 0, 48, 48, Canvas, X, Y);
 end;
 

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -569 +569 @@
 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);
+  BitBltBitmap(Dst, xDst, yDst, Width, Height, HGr.Data, xGr, yGr);
 end;
 
@@ -1116 +1115 @@
     end;
   end;
-  BitBltCanvas(HGrSystem.Mask.Canvas, CityMark2.Left, CityMark2.Top, CityMark1.Width, CityMark1.Width,
-    HGrSystem.Mask.Canvas, CityMark1.Left, CityMark1.Top);
+  BitBltBitmap(HGrSystem.Mask, CityMark2.Left, CityMark2.Top, CityMark1.Width,
+    CityMark1.Width, HGrSystem.Mask, CityMark1.Left, CityMark1.Top);
 end;
 
@@ -1216 +1215 @@
 procedure Corner(Canvas: TCanvas; X, Y, Kind: Integer; T: TTexture);
 begin
-  { BitBltCanvas(Canvas,x,y,8,8,T.HGr.Mask.Canvas,
-    T.xGr+29+Kind*9,T.yGr+89,SRCAND);
-    BitBltCanvas(Canvas,X,Y,8,8,T.HGr.Data.Canvas,
-    T.xGr+29+Kind*9,T.yGr+89,SRCPAINT); }
+  { BitBltCanvas(Canvas, x, y, 8, 8, T.HGr.Mask.Canvas,
+    T.xGr + 29 + Kind * 9, T.yGr + 89, SRCAND);
+    BitBltCanvas(Canvas, X, Y, 8, 8, T.HGr.Data.Canvas,
+    T.xGr + 29 + Kind * 9, T.yGr + 89, SRCPAINT); }
 end;
 
@@ -1454 +1453 @@
       for I := 0 to Val mod 10 - 1 do
       begin
-        BitBltCanvas(Dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 2 + 1, 14,
-          14, HGrSystem.Mask.Canvas, 67 + Kind mod 8 * 15,
+        BitBltBitmap(Dst, xIcon + 4 + I * (14 * ld div sd), yIcon + 2 + 1, 14,
+          14, HGrSystem.Mask, 67 + Kind mod 8 * 15,
           70 + Kind div 8 * 15, SRCAND);
         Sprite(Dst, HGrSystem, xIcon + 3 + I * (14 * ld div sd), yIcon + 2,
@@ -1462 +1461 @@
       for I := 0 to Val div 10 - 1 do
       begin
-        BitBltCanvas(Dst.Canvas, xIcon + 4 + (Val mod 10) *
+        BitBltBitmap(Dst, 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,
+          HGrSystem.Mask, 67 + 7 mod 8 * 15,
           70 + 7 div 8 * 15, SRCAND);
         Sprite(Dst, HGrSystem, xIcon + 3 + (Val mod 10) *
@@ -1487 +1486 @@
       for I := 0 to Val div 10 - 1 do
       begin
-        BitBltCanvas(Dst.Canvas, xIcon + 4 + I * (14 * ld div sd), yIcon + 3, 14, 14,
-          HGrSystem.Mask.Canvas, 67 + Kind mod 8 * 15,
+        BitBltBitmap(Dst, xIcon + 4 + I * (14 * ld div sd), yIcon + 3, 14, 14,
+          HGrSystem.Mask, 67 + Kind mod 8 * 15,
           70 + Kind div 8 * 15, SRCAND);
         Sprite(Dst, HGrSystem, xIcon + 3 + I * (14 * ld div sd), yIcon + 2,
@@ -1495 +1494 @@
       for I := 0 to Val mod 10 - 1 do
       begin
-        BitBltCanvas(Dst.Canvas, xIcon + 4 + (Val div 10) *
+        BitBltBitmap(Dst, 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,
+          HGrSystem.Mask, 66 + Kind mod 11 * 11,
           115 + Kind div 11 * 11, SRCAND);
         Sprite(Dst, HGrSystem, xIcon + 3 + (Val div 10) *