Changeset 463 for branches/highdpi/Packages/CevoComponents/EOTButton.pas

Timestamp:

Nov 29, 2023, 2:35:44 PM (12 months ago)

Author:

chronos

Message:

• Modified: HighDpi branch updated to trunk version.

File:

• branches/highdpi/Packages/CevoComponents/EOTButton.pas (modified) (6 diffs)

branches/highdpi/Packages/CevoComponents/EOTButton.pas

@@ -19 +19 @@
     constructor Create(aOwner: TComponent); override;
     destructor Destroy; override;
-    procedure SetButtonIndexFast(x: integer);
-    procedure SetBack(ca: TDpiCanvas; x, y: integer);
+    procedure SetButtonIndexFast(X: Integer);
+    procedure SetBack(ca: TDpiCanvas; X, Y: Integer);
   private
     FTemplate: TDpiBitmap;
-    FIndex: integer;
-    procedure SetIndex(x: integer);
+    FIndex: Integer;
+    procedure SetIndex(X: Integer);
   public
     property Template: TDpiBitmap read FTemplate write FTemplate;
   published
     property Visible;
-    property ButtonIndex: integer read FIndex write SetIndex;
+    property ButtonIndex: Integer read FIndex write SetIndex;
     property OnClick;
   protected
@@ -60 +60 @@
   Back.SetSize(48, 48);
   Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
-  ShowHint := true;
+  ShowHint := True;
   SetBounds(0, 0, 48, 48);
 end;
@@ -76 +76 @@
     if FGraphic <> nil then begin
       UnshareBitmap(Buffer);
-      DpiBitCanvas(Buffer.Canvas, 0, 0, 48, 48, Back.Canvas, 0, 0);
+      DpiBitBltCanvas(Buffer.Canvas, 0, 0, 48, 48, Back.Canvas, 0, 0);
       ImageOp_CBC(Buffer, Template, 0, 0, 133, 149 + 48 * Byte(FDown), 48, 48,
         $000000, $FFFFFF);
@@ -82 +82 @@
         ImageOp_CBC(Buffer, Template, 8, 8, 1 + 32 * Byte(FIndex), 246, 32, 32,
           $000000, $FFFFFF);
-      DpiBitCanvas(Canvas, 0, 0, 48, 48, Buffer.Canvas, 0, 0);
+      DpiBitBltCanvas(Canvas, 0, 0, 48, 48, Buffer.Canvas, 0, 0);
     end else begin
       Brush.Color := $0000FF;
@@ -89 +89 @@
 end;
 
-procedure TEOTButton.SetIndex(x: integer);
+procedure TEOTButton.SetIndex(X: Integer);
 begin
-  if x <> FIndex then begin
-    FIndex := x;
+  if X <> FIndex then begin
+    FIndex := X;
     Invalidate;
   end;
 end;
 
-procedure TEOTButton.SetButtonIndexFast(x: integer);
+procedure TEOTButton.SetButtonIndexFast(X: Integer);
 begin
-  if Visible and (x <> FIndex) then begin
-    FIndex := x;
+  if Visible and (X <> FIndex) then begin
+    FIndex := X;
     try
       Paint;
@@ -108 +108 @@
 end;
 
-procedure TEOTButton.SetBack(ca: TDpiCanvas; x, y: integer);
+procedure TEOTButton.SetBack(ca: TDpiCanvas; X, Y: Integer);
 begin
-  DpiBitCanvas(Back.Canvas, 0, 0, 48, 48, ca, x, y);
+  DpiBitBltCanvas(Back.Canvas, 0, 0, 48, 48, ca, X, Y);
 end;