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

branches/highdpi/Packages/CevoComponents/EOTButton.pas

@@ -4 +4 @@
 
 uses
-  ButtonBase, Classes, SysUtils, Graphics, LCLIntf, LCLType, UDpiControls;
+  UDpiControls, ButtonBase, Classes, SysUtils, Graphics, LCLIntf, LCLType;
 
 const
@@ -14 +14 @@
 
 type
+  // EndOfTurn button
   TEOTButton = class(TButtonBase)
   public
@@ -40 +41 @@
 implementation
 
+uses
+  ScreenTools;
 
 procedure Register;
 begin
-  RegisterComponents('Samples', [TEOTButton]);
-end;
-
-procedure ImageOp_CBC(Dst, Src: TDpiBitmap; xDst, yDst, xSrc, ySrc, w, h, Color0,
-  Color2: integer);
-// Src is template
-// B channel = Color0 amp
-// G channel = background amp (old Dst content), 128=original brightness
-// R channel = Color2 amp
-type
-  TPixel = array [0 .. 2] of Byte;
-var
-  ix, iy, amp0, amp1, trans, Value: integer;
-  SrcLine, DstLine: ^TPixel;
-begin
-  Src.BeginUpdate;
-  Dst.BeginUpdate;
-  for iy := 0 to h - 1 do
-  begin
-    SrcLine := Src.ScanLine[ySrc + iy] + xSrc * (Src.RawImage.Description.BitsPerPixel shr 3);
-    DstLine := Dst.ScanLine[yDst + iy] + xDst * (Dst.RawImage.Description.BitsPerPixel shr 3);
-    for ix := 0 to w - 1 do
-    begin
-      trans := SrcLine[0] * 2; // green channel = transparency
-      amp0 := SrcLine[1] * 2;
-      amp1 := SrcLine[2] * 2;
-      if trans <> $FF then
-      begin
-        Value := (DstLine[0] * trans + (Color2 shr 16 and $FF) * amp1
-          + (Color0 shr 16 and $FF) * amp0) div $FF;
-        if Value < 256 then
-          DstLine[0] := Value
-        else
-          DstLine[0] := 255;
-        Value := (DstLine[1] * trans + (Color2 shr 8 and $FF) * amp1
-          + (Color0 shr 8 and $FF) * amp0) div $FF;
-        if Value < 256 then
-          DstLine[1] := Value
-        else
-          DstLine[1] := 255;
-        Value := (DstLine[2] * trans + (Color2 and $FF) * amp1 +
-          (Color0 and $FF) * amp0) div $FF;
-        if Value < 256 then
-          DstLine[2] := Value
-        else
-          DstLine[2] := 255;
-      end;
-      SrcLine := Pointer(SrcLine) + (Src.RawImage.Description.BitsPerPixel shr 3);
-      DstLine := Pointer(DstLine) + (Dst.RawImage.Description.BitsPerPixel shr 3);
-    end;
-  end;
-  Src.EndUpdate;
-  Dst.EndUpdate;
+  RegisterComponents('C-evo', [TEOTButton]);
 end;
 
@@ -126 +77 @@
     begin
       // TODO: For some reason BitBlt is not working with gray background here
-      //DpiBitBlt(Buffer.Canvas.Handle, 0, 0, 48, 48, Back.Canvas.Handle, 0,
-      //  0, SRCCOPY);
+      //DpiBitCanvas(Buffer.Canvas, 0, 0, 48, 48, Back.Canvas, 0, 0);
       Buffer.Canvas.Draw(0, 0, Back);
       ImageOp_CBC(Buffer, Template, 0, 0, 133, 149 + 48 * Byte(FDown), 48, 48,
@@ -134 +84 @@
         ImageOp_CBC(Buffer, Template, 8, 8, 1 + 32 * Byte(FIndex), 246, 32, 32,
           $000000, $FFFFFF);
-      DpiBitBlt(Canvas.Handle, 0, 0, 48, 48, Buffer.Canvas.Handle, 0, 0, SRCCOPY);
+      DpiBitCanvas(Canvas, 0, 0, 48, 48, Buffer.Canvas, 0, 0);
     end
     else
@@ -140 +90 @@
       Brush.Color := $0000FF;
       FrameRect(Rect(0, 0, 48, 48))
-    end
+    end;
 end;
 
@@ -148 +98 @@
   begin
     FIndex := x;
-    Invalidate
-  end
+    Invalidate;
+  end;
 end;
 
@@ -160 +110 @@
       Paint
     except
-    end
-  end
+    end;
+  end;
 end;
 
 procedure TEOTButton.SetBack(ca: TDpiCanvas; x, y: integer);
 begin
-  DpiBitBlt(Back.Canvas.Handle, 0, 0, 48, 48, ca.Handle, x, y, SRCCOPY);
+  DpiBitCanvas(Back.Canvas, 0, 0, 48, 48, ca, x, y);
 end;