Changeset 210 for branches/highdpi/Packages/CevoComponents/ButtonB.pas

Timestamp:

May 9, 2020, 4:02:07 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved HighDPI branch. Imported new changes from trunk branch.

File:

• branches/highdpi/Packages/CevoComponents/ButtonB.pas (modified) (5 diffs)

branches/highdpi/Packages/CevoComponents/ButtonB.pas

@@ -4 +4 @@
 
 uses
-  ButtonBase, Classes, Graphics, LCLIntf, LCLType, UDpiControls;
+  UDpiControls, ButtonBase, Classes, Graphics, LCLIntf, LCLType;
 
 type
@@ -12 +12 @@
     FMask: TDpiBitmap;
     FIndex: integer;
-    procedure SetIndex(x: integer);
+    procedure SetIndex(Text: integer);
   public
     property Mask: TDpiBitmap read FMask write FMask;
@@ -25 +25 @@
 procedure Register;
 
+
 implementation
+
+uses
+  ScreenTools;
 
 procedure Register;
 begin
-  RegisterComponents('Samples', [TButtonB]);
+  RegisterComponents('C-evo', [TButtonB]);
 end;
 
@@ -35 +39 @@
 begin
   inherited Create(aOwner);
-  ShowHint := true;
+  ShowHint := True;
   SetBounds(0, 0, 25, 25);
 end;
@@ -42 +46 @@
 begin
   with Canvas do
-    if FGraphic <> nil then
-    begin
-      DpiBitBlt(Canvas.Handle, 0, 0, 25, 25, FGraphic.Canvas.Handle, 169,
-        243 + 26 * Byte(FDown), SRCCOPY);
-      if FIndex >= 0 then
-      begin
-        DpiBitBlt(Canvas.Handle, 0, 0, 25, 25, FMask.Canvas.Handle,
+    if FGraphic <> nil then begin
+      DpiBitCanvas(Canvas, 0, 0, 25, 25, FGraphic.Canvas, 169,
+        243 + 26 * Byte(FDown));
+      if FIndex >= 0 then begin
+        DpiBitCanvas(Canvas, 0, 0, 25, 25, FMask.Canvas,
           1 + FIndex mod 12 * 26, 337 + FIndex div 12 * 26, SRCAND);
-        DpiBitBlt(Canvas.Handle, 0, 0, 25, 25, FGraphic.Canvas.Handle,
+        DpiBitCanvas(Canvas, 0, 0, 25, 25, FGraphic.Canvas,
           1 + FIndex mod 12 * 26, 337 + FIndex div 12 * 26, SRCPAINT);
       end
-    end
-    else
-    begin
+    end else begin
       Brush.Color := $0000FF;
-      FrameRect(Rect(0, 0, 25, 25))
-    end
+      FrameRect(Rect(0, 0, 25, 25));
+    end;
 end;
 
-procedure TButtonB.SetIndex(x: integer);
+procedure TButtonB.SetIndex(Text: integer);
 begin
-  if x <> FIndex then
-  begin
-    FIndex := x;
-    Invalidate
-  end
+  if Text <> FIndex then begin
+    FIndex := Text;
+    Invalidate;
+  end;
 end;