Changeset 210 for branches/highdpi/LocalPlayer/Select.pas

Timestamp:

May 9, 2020, 4:02:07 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved HighDPI branch. Imported new changes from trunk branch.

File:

• branches/highdpi/LocalPlayer/Select.pas (modified) (6 diffs)

branches/highdpi/LocalPlayer/Select.pas

@@ -5 +5 @@
 
 uses
-  Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin, UDpiControls,
-  LCLIntf, LCLType, LMessages, Messages, SysUtils, Classes, Graphics, Controls, Forms,
+  UDpiControls, Protocol, ClientTools, Term, ScreenTools, IsoEngine, PVSB, BaseWin,
+
+  LCLIntf, LCLType, Messages, SysUtils, Classes, Graphics, Controls, Forms,
   ExtCtrls, ButtonB, ButtonBase, Menus, Types;
 
@@ -196 +197 @@
       if pix and cpType = 0 then
         if (pix and cpIndex = imPalace) and (MyRO.Government <> gAnarchy) then
-          DpiBitBlt(offscreen.Canvas.Handle, x + 16, y + (16 - 1), xSizeSmall,
-            ySizeSmall, SmallImp.Canvas.Handle, (MyRO.Government - 1) *
-            xSizeSmall, ySizeSmall, SRCCOPY)
+          DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+            ySizeSmall, SmallImp.Canvas, (MyRO.Government - 1) *
+            xSizeSmall, ySizeSmall)
         else
-          DpiBitBlt(offscreen.Canvas.Handle, x + 16, y + (16 - 1), xSizeSmall,
-            ySizeSmall, SmallImp.Canvas.Handle, pix and cpIndex mod 7 *
+          DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+            ySizeSmall, SmallImp.Canvas, pix and cpIndex mod 7 *
             xSizeSmall, (pix and cpIndex + SystemIconLines * 7) div 7 *
-            ySizeSmall, SRCCOPY)
+            ySizeSmall)
       else
-        DpiBitBlt(offscreen.Canvas.Handle, x + 16, y + (16 - 1), xSizeSmall,
-          ySizeSmall, SmallImp.Canvas.Handle, (3 + pix and cpIndex) *
-          xSizeSmall, 0, SRCCOPY)
+        DpiBitCanvas(offscreen.Canvas, x + 16, y + (16 - 1), xSizeSmall,
+          ySizeSmall, SmallImp.Canvas, (3 + pix and cpIndex) *
+          xSizeSmall, 0);
     end;
   end;
@@ -567 +568 @@
                   MainTexture.clBevelLight, MainTexture.clBevelShade);
                 if AdvIcon[lix] < 84 then
-                  DpiBitBlt(offscreen.Canvas.Handle, (8 + 16), y0, xSizeSmall,
-                    ySizeSmall, SmallImp.Canvas.Handle,
+                  DpiBitCanvas(offscreen.Canvas, (8 + 16), y0, xSizeSmall,
+                    ySizeSmall, SmallImp.Canvas,
                     (AdvIcon[lix] + SystemIconLines * 7) mod 7 * xSizeSmall,
                     (AdvIcon[lix] + SystemIconLines * 7) div 7 *
-                    ySizeSmall, SRCCOPY)
+                    ySizeSmall)
                 else
                   Dump(offscreen, HGrSystem, (8 + 16), y0, 36, 20,
@@ -577 +578 @@
                     295 + (AdvIcon[lix] - 84) div 8 * 21);
                 j := AdvValue[lix] div 1000;
-                DpiBitBlt(Handle, (8 + 16 - 4), y0 + 2, 14, 14,
-                  GrExt[HGrSystem].Mask.Canvas.Handle, 127 + j * 15,
+                DpiBitCanvas(Canvas, (8 + 16 - 4), y0 + 2, 14, 14,
+                  GrExt[HGrSystem].Mask.Canvas, 127 + j * 15,
                   85, SRCAND);
                 Sprite(offscreen, HGrSystem, (8 + 16 - 5), y0 + 1, 14, 14,
@@ -672 +673 @@
               8 + 16 + xSizeSmall, y0 - 15 + (16 - 1 + ySizeSmall),
               MainTexture.clBevelLight, MainTexture.clBevelShade);
-            DpiBitBlt(offscreen.Canvas.Handle, 8 + 16, y0 - 15 + (16 - 1),
-              xSizeSmall, ySizeSmall, SmallImp.Canvas.Handle,
-              (lix - 1) * xSizeSmall, ySizeSmall, SRCCOPY);
+            DpiBitCanvas(offscreen.Canvas, 8 + 16, y0 - 15 + (16 - 1),
+              xSizeSmall, ySizeSmall, SmallImp.Canvas,
+              (lix - 1) * xSizeSmall, ySizeSmall);
           end
         end;
@@ -815 +816 @@
         LoweredTextOut(Canvas, -1, MainTexture, xScreen + 10,
           ClientHeight - 29, s);
-        BitBltCanvas(ScienceNationDot.Canvas, 0, 0, 17, 17, Canvas,
-          xScreen - 10, ClientHeight - 27, SRCCOPY);
+        DpiBitCanvas(ScienceNationDot.Canvas, 0, 0, 17, 17, Canvas,
+          xScreen - 10, ClientHeight - 27);
         ImageOp_BCC(ScienceNationDot, Templates, 0, 0, 114, 211, 17, 17,
           MainTexture.clBevelShade, Tribe[ScienceNation].Color);
-        DpiBitBlt(Canvas.Handle, xScreen - 10, ClientHeight - 27, 17, 17,
-          ScienceNationDot.Canvas.Handle, 0, 0, SRCCOPY);
+        DpiBitCanvas(Canvas, xScreen - 10, ClientHeight - 27, 17, 17,
+          ScienceNationDot.Canvas, 0, 0);
       end;
     end