Changeset 349 for branches/highdpi/Packages/CevoComponents/ButtonA.pas

Timestamp:

Apr 6, 2021, 8:11:02 PM (4 years ago)

Author:

chronos

Message:

• Modified: Merged trunk branch version r348 into highdpi branch.

File:

• branches/highdpi/Packages/CevoComponents/ButtonA.pas (modified) (2 diffs)

branches/highdpi/Packages/CevoComponents/ButtonA.pas

@@ -4 +4 @@
 
 uses
-  UDpiControls, ButtonBase, Classes, Graphics, LCLIntf, LCLType, ScreenTools;
+  UDpiControls, ButtonBase, Classes, Graphics, LCLIntf, LCLType, ScreenTools, Types;
 
 type
@@ -41 +41 @@
 
 procedure TButtonA.Paint;
+var
+  TextSize: TSize;
 begin
   with Canvas do
-    if FGraphic <> nil then
-    begin
+    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)
-        div 2, FCaption);
-    end
-    else
-    begin
+      TextSize := TextExtent(FCaption);
+      TextOut(50 - (TextSize.Width + 1) div 2,
+        12 - TextSize.Height div 2, FCaption);
+    end else begin
       Brush.Color := $0000FF;
       FrameRect(Rect(0, 0, 100, 25))