Changeset 188 for trunk/LocalPlayer/Help.pas

Timestamp:

May 6, 2020, 11:21:12 PM (4 years ago)

Author:

chronos

Message:

• Modified: Simplified code by replacing BitBlt which uses always handles by BitBltCanvas which uses directly TCanvas objects. Used default ROP SRCCOPY.

File:

• trunk/LocalPlayer/Help.pas (modified) (6 diffs)

trunk/LocalPlayer/Help.pas

@@ -395 +395 @@
       ca.FrameRect(rect(x+1,i*24+1,x+24-1,i*24+24-1));
       ca.Brush.Style:=bsClear; }
-    BitBlt(ca.Handle, x, y - 4, 24, 24, GrExt[HGrSystem].Data.Canvas.Handle, 1,
-      146, SRCCOPY);
+    BitBltCanvas(ca, x, y - 4, 24, 24, GrExt[HGrSystem].Data.Canvas, 1,
+      146);
     BiColorTextOut(ca, $FFFFFF, $7F007F, x + 10 - ca.Textwidth(s[1]) div 2,
       y - 3, s[1]);
@@ -533 +533 @@
           if 4 + i * 24 + yl > InnerHeight then
             yl := InnerHeight - (4 + i * 24);
-          BitBlt(Handle, 8, 4 + i * 24, ExtPic.Width, yl, ExtPic.Canvas.Handle,
-            0, 0, SRCCOPY);
+          BitBltCanvas(OffScreen.Canvas, 8, 4 + i * 24, ExtPic.Width, yl, ExtPic.Canvas,
+            0, 0);
         end;
       end;
@@ -574 +574 @@
                 8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
               if HelpLineInfo.Picpix = imPalace then
-                BitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24,
-                  xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
-                  0 * xSizeSmall, 1 * ySizeSmall, SRCCOPY)
+                BitBltCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                  xSizeSmall, ySizeSmall, SmallImp.Canvas,
+                  0 * xSizeSmall, 1 * ySizeSmall)
               else
-                BitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24,
-                  xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+                BitBltCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                  xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   HelpLineInfo.Picpix mod 7 * xSizeSmall,
                   (HelpLineInfo.Picpix + SystemIconLines * 7) div 7 *
-                  ySizeSmall, SRCCOPY);
+                  ySizeSmall);
               x0[i] := x0[i] + (8 + 8 + 36);
             end;
@@ -641 +641 @@
                 $000000, $000000);
               if AdvIcon[HelpLineInfo.Picpix] < 84 then
-                BitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24,
-                  xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
+                BitBltCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24,
+                  xSizeSmall, ySizeSmall, SmallImp.Canvas,
                   (AdvIcon[HelpLineInfo.Picpix] + SystemIconLines * 7) mod 7 *
                   xSizeSmall, (AdvIcon[HelpLineInfo.Picpix] + SystemIconLines *
-                  7) div 7 * ySizeSmall, SRCCOPY)
+                  7) div 7 * ySizeSmall)
               else
                 Dump(OffScreen, HGrSystem, 8 + x0[i], 2 + i * 24, 36, 20,
@@ -651 +651 @@
                   295 + (AdvIcon[HelpLineInfo.Picpix] - 84) div 8 * 21);
               j := AdvValue[HelpLineInfo.Picpix] div 1000;
-              BitBlt(Handle, x0[i] + 4, 4 + i * 24, 14, 14,
-                GrExt[HGrSystem].Mask.Canvas.Handle, 127 + j * 15, 85, SRCAND);
+              BitBltCanvas(OffScreen.Canvas, x0[i] + 4, 4 + i * 24, 14, 14,
+                GrExt[HGrSystem].Mask.Canvas, 127 + j * 15, 85, SRCAND);
               Sprite(OffScreen, HGrSystem, x0[i] + 3, 3 + i * 24, 14, 14,
                 127 + j * 15, 85);
@@ -828 +828 @@
               ScreenTools.Frame(OffScreen.Canvas, 8 - 1 + x0[i], 2 - 1 + i * 24,
                 8 + xSizeSmall + x0[i], 2 + 20 + i * 24, $000000, $000000);
-              BitBlt(OffScreen.Canvas.Handle, 8 + x0[i], 2 + i * 24, xSizeSmall,
-                ySizeSmall, SmallImp.Canvas.Handle, (HelpLineInfo.Picpix - 1) *
-                xSizeSmall, ySizeSmall, SRCCOPY);
+              BitBltCanvas(OffScreen.Canvas, 8 + x0[i], 2 + i * 24, xSizeSmall,
+                ySizeSmall, SmallImp.Canvas, (HelpLineInfo.Picpix - 1) *
+                xSizeSmall, ySizeSmall);
               x0[i] := x0[i] + (8 + 8 + 36);
             end;