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

branches/highdpi/Packages/CevoComponents/ButtonA.pas

@@ -4 +4 @@
 
 uses
-  ButtonBase,
-  Classes, Graphics, LCLIntf, LCLType, UDpiControls;
+  UDpiControls, ButtonBase, Classes, Graphics, LCLIntf, LCLType, ScreenTools;
 
 type
@@ -12 +11 @@
   private
     FCaption: string;
-    procedure SetCaption(x: string);
-    procedure SetFont(const x: TDpiFont);
+    procedure SetCaption(Text: string);
+    procedure SetFont(const Font: TDpiFont);
   published
     property Visible;
@@ -26 +25 @@
 procedure Register;
 
+
 implementation
 
 procedure Register;
 begin
-  RegisterComponents('Samples', [TButtonA]);
+  RegisterComponents('C-evo', [TButtonA]);
 end;
 
@@ -43 +43 @@
 begin
   with Canvas do
-    if FGraphic <> nil then begin
-      DpiBitBlt(Canvas.Handle, 0, 0, 100, 25, Graphic.Canvas.Handle, 195,
-        243 + 26 * Byte(Down), SRCCOPY);
+    if FGraphic <> nil then
+    begin
+      DpiBitCanvas(Canvas, 0, 0, 100, 25, Graphic.Canvas, 195,
+        243 + 26 * Byte(Down));
       Canvas.Brush.Style := bsClear;
-      TextOut(50 - (TextWidth(FCaption) + 1) div 2, 12 - TextHeight(FCaption)
+      Textout(50 - (TextWidth(FCaption) + 1) div 2, 12 - textheight(FCaption)
         div 2, FCaption);
-    end else begin
+    end
+    else
+    begin
       Brush.Color := $0000FF;
       FrameRect(Rect(0, 0, 100, 25))
-    end
+    end;
 end;
 
-procedure TButtonA.SetCaption(x: string);
+procedure TButtonA.SetCaption(Text: string);
 begin
-  if x <> FCaption then
-  begin
-    FCaption := x;
-    Invalidate
-  end
+  if Text <> FCaption then begin
+    FCaption := Text;
+    Invalidate;
+  end;
 end;
 
-procedure TButtonA.SetFont(const x: TDpiFont);
+procedure TButtonA.SetFont(const Font: TDpiFont);
 begin
-  Canvas.Font.Assign(x);
+  Canvas.Font.Assign(Font);
   Canvas.Font.Color := $000000;
 end;