Changeset 210 for branches/highdpi/Packages/CevoComponents/ButtonN.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/ButtonN.pas (modified) (9 diffs)

branches/highdpi/Packages/CevoComponents/ButtonN.pas

@@ -4 +4 @@
 
 uses
-  Classes, Graphics, Controls, LCLIntf, LCLType, UDpiControls;
+  UDpiControls, Classes, Graphics, Controls, LCLIntf, LCLType, ScreenTools;
 
 type
-  TButtonN = class(TGraphicControl)
+  TButtonN = class(TDpiGraphicControl)
     constructor Create(aOwner: TComponent); override;
   private
@@ -40 +40 @@
 procedure Register;
 begin
-  RegisterComponents('Samples', [TButtonN]);
+  RegisterComponents('C-evo', [TButtonN]);
 end;
 
@@ -62 +62 @@
     if FGraphic <> nil then
     begin
-      DpiBitBlt(Canvas.Handle, 1, 1, 40, 40, FBackGraphic.Canvas.Handle,
-        1 + 80 * BackIndex + 40 * byte(FPossible and FLit), 176, SRCCOPY);
+      DpiBitCanvas(Canvas, 1, 1, 40, 40, FBackGraphic.Canvas,
+        1 + 80 * BackIndex + 40 * byte(FPossible and FLit), 176);
       if FPossible then
       begin
-        DpiBitBlt(Canvas.Handle, 3, 3, 36, 36, FMask.Canvas.Handle,
+        DpiBitCanvas(Canvas, 3, 3, 36, 36, FMask.Canvas,
           195 + 37 * (FIndex mod 3), 21 + 37 * (FIndex div 3), SRCAND);
-        DpiBitBlt(Canvas.Handle, 3, 3, 36, 36, FGraphic.Canvas.Handle,
+        DpiBitCanvas(Canvas, 3, 3, 36, 36, FGraphic.Canvas,
           195 + 37 * (FIndex mod 3), 21 + 37 * (FIndex div 3), SRCPAINT);
-      end
+      end;
     end;
     MoveTo(0, 41);
@@ -79 +79 @@
     LineTo(41, 41);
     LineTo(0, 41);
-  end
+  end;
 end;
 
@@ -86 +86 @@
 begin
   if FPossible and (Button = mbLeft) and (@ChangeProc <> nil) then
-    ChangeProc(Self)
+    ChangeProc(Self);
 end;
 
@@ -98 +98 @@
     else
       Hint := '';
-    Invalidate
-  end
+    Invalidate;
+  end;
 end;
 
@@ -107 +107 @@
   begin
     FLit := x;
-    Invalidate
-  end
+    Invalidate;
+  end;
 end;
 
@@ -120 +120 @@
     else
       BackIndex := 0;
-    Invalidate
-  end
+    Invalidate;
+  end;
 end;
 
@@ -131 +131 @@
     if FPossible then
       Hint := x;
-  end
+  end;
 end;