Changeset 210 for branches/highdpi/LocalPlayer/Battle.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/LocalPlayer/Battle.pas (modified) (6 diffs)

branches/highdpi/LocalPlayer/Battle.pas

@@ -5 +5 @@
 
 uses
-  ScreenTools, Protocol, Messg, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
-  SysUtils, Classes, Graphics, Controls, Forms, DrawDlg, UDpiControls;
+  UDpiControls, ScreenTools, Protocol, ButtonBase, ButtonA, Types, LCLIntf, LCLType,
+  SysUtils, Classes, Graphics, Controls, Forms, DrawDlg;
 
 type
@@ -107 +107 @@
     VLightGradient(ca, xm - 8, ym + 8 + LABaseDamage, LADamage - LABaseDamage,
       FanaticColor);
-  DpiBitBlt(ca.Handle, xm - 12, ym - 12, 24, 24,
-    GrExt[HGrSystem].Mask.Canvas.Handle, 26, 146, SRCAND);
-  DpiBitBlt(ca.Handle, xm - 12, ym - 12, 24, 24,
-    GrExt[HGrSystem].Data.Canvas.Handle, 26, 146, SRCPAINT);
+  DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
+    GrExt[HGrSystem].Mask.Canvas, 26, 146, SRCAND);
+  DpiBitCanvas(ca, xm - 12, ym - 12, 24, 24,
+    GrExt[HGrSystem].Data.Canvas, 26, 146, SRCPAINT);
 
   LabelText := Format('%d', [Forecast.AStr]);
@@ -132 +132 @@
   if Forecast.EndHealthDef <= 0 then
   begin
-    DpiBitBlt(ca.Handle, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
-    DpiBitBlt(ca.Handle, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
-    DpiBitBlt(ca.Handle, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
-      GrExt[HGrSystem].Data.Canvas.Handle, 51, 153, SRCPAINT);
+    DpiBitCanvas(ca, xm + 9 + LDDamage - 7, ym - 6, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+    DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+    DpiBitCanvas(ca, xm + 8 + LDDamage - 7, ym - 7, 14, 17,
+      GrExt[HGrSystem].Data.Canvas, 51, 153, SRCPAINT);
   end;
   LabelText := Format('%d', [DDamage]);
@@ -152 +152 @@
   if Forecast.EndHealthAtt <= 0 then
   begin
-    DpiBitBlt(ca.Handle, xm - 6, ym + 9 + LADamage - 7, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
-    DpiBitBlt(ca.Handle, xm - 7, ym + 8 + LADamage - 7, 14, 17,
-      GrExt[HGrSystem].Mask.Canvas.Handle, 51, 153, SRCAND);
-    DpiBitBlt(ca.Handle, xm - 7, ym + 8 + LADamage - 7, 14, 17,
-      GrExt[HGrSystem].Data.Canvas.Handle, 51, 153, SRCPAINT);
+    DpiBitCanvas(ca, xm - 6, ym + 9 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+    DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Mask.Canvas, 51, 153, SRCAND);
+    DpiBitCanvas(ca, xm - 7, ym + 8 + LADamage - 7, 14, 17,
+      GrExt[HGrSystem].Data.Canvas, 51, 153, SRCPAINT);
   end;
   LabelText := Format('%d', [MyUn[uix].Health - Forecast.EndHealthAtt]);
@@ -173 +173 @@
 
   NoMap.SetOutput(Buffer);
-  DpiBitBlt(Buffer.Canvas.Handle, 0, 0, 66, 48, ca.Handle, xm + 8 + 4,
-    ym - 8 - 12 - 48, SRCCOPY);
+  DpiBitCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm + 8 + 4,
+    ym - 8 - 12 - 48);
   { if TerrType<fForest then
     Sprite(Buffer,HGrTerrain,0,16,66,32,1+TerrType*(xxt*2+1),1+yyt)
@@ -185 +185 @@
     end; }
   NoMap.PaintUnit(1, 0, UnitInfo, 0);
-  DpiBitBlt(ca.Handle, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas.Handle,
-    0, 0, SRCCOPY);
-
-  DpiBitBlt(Buffer.Canvas.Handle, 0, 0, 66, 48, ca.Handle, xm - 8 - 4 - 66,
-    ym + 8 + 12, SRCCOPY);
+  DpiBitCanvas(ca, xm + 8 + 4, ym - 8 - 12 - 48, 66, 48, Buffer.Canvas,
+    0, 0);
+
+  DpiBitCanvas(Buffer.Canvas, 0, 0, 66, 48, ca, xm - 8 - 4 - 66,
+    ym + 8 + 12);
   MakeUnitInfo(me, MyUn[uix], UnitInfo);
   UnitInfo.Flags := UnitInfo.Flags and not unFortified;
   NoMap.PaintUnit(1, 0, UnitInfo, 0);
-  DpiBitBlt(ca.Handle, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas.Handle,
-    0, 0, SRCCOPY);
+  DpiBitCanvas(ca, xm - 8 - 4 - 66, ym + 8 + 12, 66, 48, Buffer.Canvas, 0, 0);
 end; { PaintBattleOutcome }