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

branches/highdpi/Packages/CevoComponents/EOTButton.pas

@@ -74 +74 @@
 begin
   with Canvas do
-    if FGraphic <> nil then
-    begin
-      // TODO: For some reason BitBlt is not working with gray background here
-      //DpiBitCanvas(Buffer.Canvas, 0, 0, 48, 48, Back.Canvas, 0, 0);
-      Buffer.Canvas.Draw(0, 0, Back);
+    if FGraphic <> nil then begin
+      UnshareBitmap(Buffer);
+      DpiBitCanvas(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);
@@ -85 +83 @@
           $000000, $FFFFFF);
       DpiBitCanvas(Canvas, 0, 0, 48, 48, Buffer.Canvas, 0, 0);
-    end
-    else
-    begin
+    end else begin
       Brush.Color := $0000FF;
       FrameRect(Rect(0, 0, 48, 48))
@@ -95 +91 @@
 procedure TEOTButton.SetIndex(x: integer);
 begin
-  if x <> FIndex then
-  begin
+  if x <> FIndex then begin
     FIndex := x;
     Invalidate;
@@ -104 +99 @@
 procedure TEOTButton.SetButtonIndexFast(x: integer);
 begin
-  if Visible and (x <> FIndex) then
-  begin
+  if Visible and (x <> FIndex) then begin
     FIndex := x;
     try
-      Paint
+      Paint;
     except
     end;