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

branches/highdpi/LocalPlayer/Draft.pas

@@ -233 +233 @@
 begin
   inherited;
-  // TODO: Explicitly clear background to black but in fact BitBlt SRCCOPY should do it
-  Back.Canvas.FillRect(0, 0, Back.Width, Back.Height);
+  UnshareBitmap(Back);
 
   ClientHeight := Template.Height - Cut;
@@ -275 +274 @@
           x := xDomain + d * DomainPitch;
           if d = Domain then
-            ImageOp_BCC(offscreen, Templates, x, yDomain, 142, 246 + 37 * d, 36,
+            ImageOp_BCC(offscreen, Templates.Data, x, yDomain, 142, 246 + 37 * d, 36,
               36, 0, $00C0FF)
           else
-            ImageOp_BCC(offscreen, Templates, x, yDomain, 142, 246 + 37 * d, 36,
+            ImageOp_BCC(offscreen, Templates.Data, x, yDomain, 142, 246 + 37 * d, 36,
               36, 0, $606060);
         end;
@@ -300 +299 @@
       for i := 0 to MaxWeight - 1 do
         if i < Weight then
-          ImageOp_BCC(offscreen, Templates, xWeight + 20 * i, yWeight, 123, 400,
-            18, 20, 0, $949494)
+          ImageOp_BCC(offscreen, Templates.Data, Point(xWeight + 20 * i, yWeight),
+            WeightOn.BoundsRect, 0, $949494)
         else
-          ImageOp_BCC(offscreen, Templates, xWeight + 20 * i, yWeight, 105, 400,
-            18, 20, 0, $949494);
+          ImageOp_BCC(offscreen, Templates.Data, Point(xWeight + 20 * i, yWeight),
+            WeightOff.BoundsRect, 0, $949494);
     end;
 
@@ -336 +335 @@
           // paint cost
           LightGradient(offscreen.Canvas, xFeature + 34,
-            yFeature + LinePitch * i, 50, GrExt[HGrSystem].Data.Canvas.Pixels
+            yFeature + LinePitch * i, 50, HGrSystem.Data.Canvas.Pixels
             [187, 137]);
           if (Domain = dGround) and (code[i] = mcDefense) then